[rocketmq] branch develop updated: Fix NPE when getting the localhost using admin tool (#518)

[vongosling]

This is an automated email from the ASF dual-hosted git repository.

vongosling pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 60efa68  Fix NPE when getting the localhost using admin tool (#518)
60efa68 is described below

commit 60efa68f3bdff7847d0216f494afe95b85b8954e
Author: ymwneu <ymw...@126.com>
AuthorDate: Fri Nov 2 15:39:50 2018 +0800

    Fix NPE when getting the localhost using admin tool (#518)
---
 .../java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
 
b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
index bcd6666..2a7815b 100644
--- 
a/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
+++ 
b/tools/src/main/java/org/apache/rocketmq/tools/admin/DefaultMQAdminExtImpl.java
@@ -842,7 +842,7 @@ public class DefaultMQAdminExtImpl implements MQAdminExt, 
MQAdminExtInner {
                 BrokerData brokerData = 
ci.getBrokerAddrTable().get(mq.getBrokerName());
                 if (brokerData != null) {
                     String addr = 
brokerData.getBrokerAddrs().get(MixAll.MASTER_ID);
-                    if 
(addr.equals(RemotingUtil.socketAddress2String(msg.getStoreHost()))) {
+                    if 
(RemotingUtil.socketAddress2String(msg.getStoreHost()).equals(addr)) {
                         if (next.getValue().getConsumerOffset() > 
msg.getQueueOffset()) {
                             return true;
                         }