You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/07/28 19:30:55 UTC

[2/4] activemq-artemis git commit: Avoid NPE on testMultipleSenders null response

Avoid NPE on testMultipleSenders null response


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7a5d1434
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7a5d1434
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7a5d1434

Branch: refs/heads/master
Commit: 7a5d1434fb72f2127919d3f7676431ef8f4201fd
Parents: 72bf5b7
Author: Ville Skytt� <vi...@iki.fi>
Authored: Thu Jul 28 20:00:02 2016 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Jul 28 15:25:45 2016 -0400

----------------------------------------------------------------------
 .../artemis/core/server/group/impl/ClusteredResetMockTest.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a5d1434/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java
index aea4ae2..47b45fa 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/group/impl/ClusteredResetMockTest.java
@@ -158,8 +158,7 @@ public class ClusteredResetMockTest extends ActiveMQTestBase {
             if (response == null) {
                ex = new NullPointerException("expected value on " + getName());
             }
-
-            if (!response.getGroupId().equals(code)) {
+            else if (!response.getGroupId().equals(code)) {
                ex = new IllegalStateException("expected code=" + code + " but it was " + response.getGroupId());
             }
          }