Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D6AF6200B62 for ; Thu, 28 Jul 2016 21:30:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D33B6160A56; Thu, 28 Jul 2016 19:30:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2CB6E160A85 for ; Thu, 28 Jul 2016 21:30:55 +0200 (CEST) Received: (qmail 65031 invoked by uid 500); 28 Jul 2016 19:30:54 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 64935 invoked by uid 99); 28 Jul 2016 19:30:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Jul 2016 19:30:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 137BDDFDD3; Thu, 28 Jul 2016 19:30:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Thu, 28 Jul 2016 19:30:55 -0000 Message-Id: <2371a9755f864edc845475257841ce75@git.apache.org> In-Reply-To: <40488c7030754293bd8243ce0ea31f0f@git.apache.org> References: <40488c7030754293bd8243ce0ea31f0f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] activemq-artemis git commit: Avoid NPE on testMultipleSenders null response archived-at: Thu, 28 Jul 2016 19:30:56 -0000 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ä Authored: Thu Jul 28 20:00:02 2016 +0300 Committer: Clebert Suconic 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()); } }