Return-Path: 
 <commits-return-39149-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 8F773192E7
	for <apmail-activemq-commits-archive@www.apache.org>;
 Thu, 31 Mar 2016 02:30:57 +0000 (UTC)
Received: (qmail 98855 invoked by uid 500); 31 Mar 2016 02:30:57 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 98541 invoked by uid 500); 31 Mar 2016 02:30:57 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 93870 invoked by uid 99); 31 Mar 2016 02:30:44 -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, 31 Mar 2016 02:30:44 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 96751E098D; Thu, 31 Mar 2016 02:30:44 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: clebertsuconic@apache.org
To: commits@activemq.apache.org
Date: Thu, 31 Mar 2016 02:31:22 -0000
Message-Id: <e06ce93183234bf8aad023088bf3d507@git.apache.org>
In-Reply-To: <e8ce570811ab439f9e3b19d68c2e13ed@git.apache.org>
References: <e8ce570811ab439f9e3b19d68c2e13ed@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [40/69] [abbrv] activemq-artemis git commit: avoiding NPE

avoiding NPE


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

Branch: refs/heads/refactor-openwire
Commit: 9e95d8e803cb8be0c5900a0fc3f6db16391a0262
Parents: 6dab08d
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Fri Feb 19 15:37:12 2016 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Wed Mar 30 22:29:44 2016 -0400

----------------------------------------------------------------------
 .../artemis/core/protocol/openwire/OpenWireProtocolManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9e95d8e8/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
index bd26b07..014181d 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
@@ -811,7 +811,7 @@ public class OpenWireProtocolManager implements ProtocolManager<Interceptor>, No
    public void sendBrokerInfo(OpenWireConnection connection) {
       BrokerInfo brokerInfo = new BrokerInfo();
       brokerInfo.setBrokerName(server.getIdentity());
-      brokerInfo.setBrokerId(new BrokerId(server.getNodeID().toString()));
+      brokerInfo.setBrokerId(new BrokerId("" + server.getNodeID()));
       brokerInfo.setPeerBrokerInfos(null);
       brokerInfo.setFaultTolerantConfiguration(false);
       brokerInfo.setBrokerURL(connection.getLocalAddress());