Skip to content

Commit 69334fa

Browse files
committed
Include the name of the failed command in TS3CommandFailedException
1 parent 022e11b commit 69334fa

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

src/main/java/com/github/theholywaffle/teamspeak3/SocketReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ private void handleCommandError(ResponseBuilder responseBuilder, final String er
168168
log.debug("TS3 command error: {}", queryError);
169169

170170
ts3.submitUserTask("Future FailureListener (" + command.getName() + ")",
171-
() -> future.fail(new TS3CommandFailedException(queryError)));
171+
() -> future.fail(new TS3CommandFailedException(queryError, command.getName())));
172172
}
173173
}
174174

src/main/java/com/github/theholywaffle/teamspeak3/TS3ApiAsync.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,7 @@ public CommandFuture<Long> downloadFile(OutputStream dataOut, String filePath, i
14891489
executeAndTransformFirst(cmd, FileTransferParameters::new).onSuccess(params -> {
14901490
QueryError error = params.getQueryError();
14911491
if (!error.isSuccessful()) {
1492-
future.fail(new TS3CommandFailedException(error));
1492+
future.fail(new TS3CommandFailedException(error, cmd.getName()));
14931493
return;
14941494
}
14951495

@@ -1570,7 +1570,7 @@ public CommandFuture<byte[]> downloadFileDirect(String filePath, int channelId,
15701570
executeAndTransformFirst(cmd, FileTransferParameters::new).onSuccess(params -> {
15711571
QueryError error = params.getQueryError();
15721572
if (!error.isSuccessful()) {
1573-
future.fail(new TS3CommandFailedException(error));
1573+
future.fail(new TS3CommandFailedException(error, cmd.getName()));
15741574
return;
15751575
}
15761576

@@ -4905,7 +4905,7 @@ public CommandFuture<Void> uploadFile(InputStream dataIn, long dataLength, Strin
49054905
executeAndTransformFirst(cmd, FileTransferParameters::new).onSuccess(params -> {
49064906
QueryError error = params.getQueryError();
49074907
if (!error.isSuccessful()) {
4908-
future.fail(new TS3CommandFailedException(error));
4908+
future.fail(new TS3CommandFailedException(error, cmd.getName()));
49094909
return;
49104910
}
49114911

src/main/java/com/github/theholywaffle/teamspeak3/api/exception/TS3CommandFailedException.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ public class TS3CommandFailedException extends TS3Exception {
3434

3535
private final QueryError queryError;
3636

37-
public TS3CommandFailedException(QueryError error) {
38-
super(buildMessage(error));
37+
public TS3CommandFailedException(QueryError error, String commandName) {
38+
super(buildMessage(error, commandName));
3939
queryError = error;
4040
}
4141

42-
private static String buildMessage(QueryError error) {
43-
final StringBuilder msg = new StringBuilder("A command returned with a server error.\n");
42+
private static String buildMessage(QueryError error, String cmdName) {
43+
final StringBuilder msg = new StringBuilder();
44+
msg.append("A \"").append(cmdName).append("\" command returned with a server error.\n");
4445
msg.append(">> ").append(error.getMessage()).append(" (ID ").append(error.getId()).append(')');
4546

4647
final String extra = error.getExtraMessage();

0 commit comments

Comments
 (0)