[rocketmq] branch develop updated: fix(util) make ipv4 first when choosing local IP

[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 48379e4  fix(util) make ipv4 first when choosing local IP
     new 234e04c  Merge pull request #1625 from duhenglucky/ipv4_first
48379e4 is described below

commit 48379e4b57274f6207dd088a29b59a5c8ff81aaf
Author: duhenglucky <duhengfore...@apache.org>
AuthorDate: Fri Nov 29 00:01:35 2019 +0800

    fix(util) make ipv4 first when choosing local IP
---
 common/src/main/java/org/apache/rocketmq/common/UtilAll.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/src/main/java/org/apache/rocketmq/common/UtilAll.java 
b/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
index 222f697..e1c7485 100644
--- a/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
+++ b/common/src/main/java/org/apache/rocketmq/common/UtilAll.java
@@ -547,8 +547,6 @@ public class UtilAll {
                             if (ipV6Check(ipByte)) {
                                 if (!isInternalV6IP(ip)) {
                                     return ipByte;
-                                } else if (internalIP == null) {
-                                    internalIP = ipByte;
                                 }
                             }
                         }