Skip to content

Commit 4b94ac1

Browse files
committed
[Exceptions] Minor reworks to get an meaningful messages.
Signed-off-by: Tatiana Leon <tatiana.leon@digi.com>
1 parent da6a428 commit 4b94ac1

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

library/src/main/java/com/digi/xbee/api/exceptions/ATCommandException.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,17 @@ public String getCommandStatusMessage() {
105105
*/
106106
@Override
107107
public String getMessage() {
108-
if (atCommandStatus != null)
109-
return super.getMessage() + " > " + atCommandStatus.getDescription();
110-
return super.getMessage();
108+
String message = super.getMessage();
109+
110+
if (message == null)
111+
message = "";
112+
113+
if (atCommandStatus != null) {
114+
if (message.length() > 0)
115+
message = message + " > ";
116+
message = message + atCommandStatus.getDescription();
117+
}
118+
119+
return message;
111120
}
112121
}

library/src/main/java/com/digi/xbee/api/exceptions/TransmitException.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,17 @@ public String getTransmitStatusMessage() {
103103
*/
104104
@Override
105105
public String getMessage() {
106-
if (transmitStatus != null)
107-
return super.getMessage() + " > " + transmitStatus.toString();
108-
return super.getMessage();
106+
String message = super.getMessage();
107+
108+
if (message == null)
109+
message = "";
110+
111+
if (transmitStatus != null) {
112+
if (message.length() > 0)
113+
message = message + " > ";
114+
message = message + transmitStatus.toString();
115+
}
116+
117+
return message;
109118
}
110119
}

0 commit comments

Comments
 (0)