fixed bug in findProxyUrl with non_proxy where empty system property was not detected

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/Utils.java

@@ -450,36 +450,39 @@ private static List<String> getDockerRunCmd(String builder, String scriptToRun,
      * @return proxy url for given protocol
      */
     public static String findProxyUrl(String proxyUrl, String protocol) {
-        String retVal = proxyUrl;
-        if (isEmptyString(retVal) && !isEmptyString(protocol)) {
-            switch (protocol.toLowerCase()) {
-                case Constants.HTTP:
-                case Constants.HTTPS:
-                    String envVarName = String.format("%s_proxy", protocol);
-                    retVal = getProxyEnvironmentVariableValue(envVarName);
-                    if (isEmptyString(retVal)) {
-                        String proxyHost = System.getProperty(String.format("%s.proxyHost", protocol), null);
-                        String proxyPort = System.getProperty(String.format("%s.proxyPort", protocol), "80");
-                        if (proxyHost != null) {
-                            retVal = String.format("%s://%s:%s", protocol, proxyHost, proxyPort);
-                        }
+        if (!isEmptyString(proxyUrl)) {
+            return proxyUrl;
+        }
+        String result;
+        switch (protocol.toLowerCase()) {
+            case Constants.HTTP:
+            case Constants.HTTPS:
+                String envVarName = String.format("%s_proxy", protocol);
+                result = getProxyEnvironmentVariableValue(envVarName);
+                if (isEmptyString(result)) {
+                    String proxyHost = System.getProperty(String.format("%s.proxyHost", protocol), null);
+                    String proxyPort = System.getProperty(String.format("%s.proxyPort", protocol), "80");
+                    if (proxyHost != null) {
+                        result = String.format("%s://%s:%s", protocol, proxyHost, proxyPort);
                     }
-                    break;
-                case "none":
-                default:
-                    retVal = getProxyEnvironmentVariableValue("no_proxy");
-                    if (isEmptyString(retVal)) {
-                        retVal = System.getProperty("http.nonProxyHosts", null);
-                        if (!isEmptyString(retVal)) {
-                            //http.nonProxyHosts property uses | instead of , as a separator
-                            retVal = retVal.replace("|", ",");
-                        }
+                }
+                break;
+            case "none":
+            default:
+                result = getProxyEnvironmentVariableValue("no_proxy");
+                if (isEmptyString(result)) {
+                    String propertyValue = System.getProperty("http.nonProxyHosts", null);
+                    if (isEmptyString(propertyValue)) {
+                        result = null;
+                    } else {
+                        //http.nonProxyHosts property uses | instead of , as a separator
+                        result = propertyValue.replace("|", ",");
                     }
-                    break;
-            }
+                }
+                break;
         }
-        logger.finer("Discovered proxy setting ({0}): {1}", protocol, retVal);
-        return retVal;
+        logger.finer("Discovered proxy setting ({0}): {1}", protocol, result);
+        return result;
     }
 
     /**

imagetool/src/test/java/com/oracle/weblogic/imagetool/util/UtilsTest.java

@@ -204,6 +204,7 @@ void findProxyUrlForNoProxy() {
         // No ENV variable set (filed issue on SystemStub)
         environment.set("no_proxy", null);
         environment.set("NO_PROXY", null);
+        overrideProperties.set("http.nonProxyHosts", "");
         assertNull(Utils.findProxyUrl("", "none"));
 
         String expected = ".host.com,.anotherhost.com,.and.another.com";