From commits-return-4883-apmail-rocketmq-commits-archive=rocketmq.apache.org@rocketmq.apache.org Fri Jan 3 07:41:17 2020 Return-Path: X-Original-To: apmail-rocketmq-commits-archive@minotaur.apache.org Delivered-To: apmail-rocketmq-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id CD34A19C8B for ; Fri, 3 Jan 2020 07:41:16 +0000 (UTC) Received: (qmail 86544 invoked by uid 500); 3 Jan 2020 07:41:16 -0000 Delivered-To: apmail-rocketmq-commits-archive@rocketmq.apache.org Received: (qmail 86522 invoked by uid 500); 3 Jan 2020 07:41:16 -0000 Mailing-List: contact commits-help@rocketmq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@rocketmq.apache.org Delivered-To: mailing list commits@rocketmq.apache.org Received: (qmail 86513 invoked by uid 99); 3 Jan 2020 07:41:16 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jan 2020 07:41:16 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 12C368D80D; Fri, 3 Jan 2020 07:41:16 +0000 (UTC) Date: Fri, 03 Jan 2020 07:41:16 +0000 To: "commits@rocketmq.apache.org" Subject: [rocketmq] branch develop updated: fix(util) make ipv4 first when choosing local IP MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157803727596.10809.7972144329032432765@gitbox.apache.org> From: vongosling@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: rocketmq X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: c048e588c1c9a297ce5c4d00c9d04fb6e6ef6669 X-Git-Newrev: 48379e4b57274f6207dd088a29b59a5c8ff81aaf X-Git-Rev: 48379e4b57274f6207dd088a29b59a5c8ff81aaf X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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; } } }