From 4bf5d5b076b9944a59e3ffb7d0b305f32b5d4331 Mon Sep 17 00:00:00 2001 From: MabinGo Date: Wed, 11 Oct 2017 16:54:25 +0800 Subject: [PATCH 1/2] Fix code warning Signed-off-by: MabinGo --- .../java/io/servicecomb/foundation/common/net/NetUtils.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) mode change 100644 => 100755 foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/net/NetUtils.java diff --git a/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/net/NetUtils.java b/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/net/NetUtils.java old mode 100644 new mode 100755 index 6f872188022..ee8249cc36c --- a/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/net/NetUtils.java +++ b/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/net/NetUtils.java @@ -107,8 +107,6 @@ private static void doGetIpv4AddressFromNetworkInterface() throws SocketExceptio } } } - - return; } /** @@ -151,7 +149,7 @@ public static IpPort parseIpPortFromURI(String uriAddress) { */ public static String getRealListenAddress(String schema, String address) { if (address == null) { - return address; + return null; } try { URI originalURI = new URI(schema + "://" + address); From bc920e3925679f20325d5de2018cafc53c53bf5e Mon Sep 17 00:00:00 2001 From: MabinGo Date: Wed, 11 Oct 2017 16:55:13 +0800 Subject: [PATCH 2/2] [JAV-433] Error should be reported instead of the warning when the IP&Port is invalid Signed-off-by: MabinGo --- .../java/io/servicecomb/foundation/common/net/NetUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/net/NetUtils.java b/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/net/NetUtils.java index ee8249cc36c..d0f07423459 100755 --- a/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/net/NetUtils.java +++ b/foundations/foundation-common/src/main/java/io/servicecomb/foundation/common/net/NetUtils.java @@ -155,12 +155,12 @@ public static String getRealListenAddress(String schema, String address) { URI originalURI = new URI(schema + "://" + address); IpPort ipPort = NetUtils.parseIpPort(originalURI.getAuthority()); if (ipPort == null) { - LOGGER.warn("address {} not valid.", address); + LOGGER.error("address {} is not valid.", address); return null; } return originalURI.toString(); } catch (URISyntaxException e) { - LOGGER.warn("address {} not valid.", address); + LOGGER.error("address {} is not valid.", address); return null; } }