Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NPE in management test

This commit is contained in:
jbertram 2015-07-30 10:35:20 -05:00 committed by Clebert Suconic
parent 5e2a405555
commit ecc2cecf87
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
View File

@ -94,13 +94,20 @@ public class CoreMessagingProxy
ClientMessage m = session.createMessage(false);
ManagementHelper.putOperationInvocation(m, resourceName, operationName, args);
ClientMessage reply = requestor.request(m);
if (ManagementHelper.hasOperationSucceeded(reply))
if (reply != null)
{
return ManagementHelper.getResult(reply);
if (ManagementHelper.hasOperationSucceeded(reply))
{
return ManagementHelper.getResult(reply);
}
else
{
throw new Exception((String) ManagementHelper.getResult(reply));
}
}
else
{
throw new Exception((String)ManagementHelper.getResult(reply));
return null;
}
}