AXIS-2295 Apply community suggested fixes to http proxy parameters caching mechanism

Robert Lazarski · Robert Lazarski · commit a596f2cd4672 · 2020-03-19T14:46:35.000Z
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
@@ -37,59 +37,49 @@ public class DefaultHTTPTransportClientProperties
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyHost()
      */
     public String getProxyHost() {
-        if (proxyHost == null) {
-            proxyHost = AxisProperties.getProperty("http.proxyHost");
-            if (proxyHost == null)
-                proxyHost = emptyString;
-        }
+        proxyHost = AxisProperties.getProperty("http.proxyHost");
+        if (proxyHost == null)
+            proxyHost = emptyString;
         return proxyHost;
     }
 
     /**
      * @see org.apache.axis.components.net.TransportClientProperties#getNonProxyHosts()
      */
     public String getNonProxyHosts() {
-        if (nonProxyHosts == null) {
-            nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
-            if (nonProxyHosts == null)
-                nonProxyHosts = emptyString;
-        }
+        nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
+        if (nonProxyHosts == null)
+            nonProxyHosts = emptyString;
         return nonProxyHosts;
     }
 
     /**
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyPort()
      */
     public String getProxyPort() {
-        if (proxyPort == null) {
-            proxyPort = AxisProperties.getProperty("http.proxyPort");
-            if (proxyPort == null)
-                proxyPort = emptyString;
-        }
+        proxyPort = AxisProperties.getProperty("http.proxyPort");
+        if (proxyPort == null)
+            proxyPort = emptyString;
         return proxyPort;
     }
 
     /**
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyUser()
      */
     public String getProxyUser() {
-        if (proxyUser == null) {
-            proxyUser = AxisProperties.getProperty("http.proxyUser");
-            if (proxyUser == null)
-                proxyUser = emptyString;
-        }
+        proxyUser = AxisProperties.getProperty("http.proxyUser");
+        if (proxyUser == null)
+            proxyUser = emptyString;
         return proxyUser;
     }
 
     /**
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyPassword()
      */
     public String getProxyPassword() {
-        if (proxyPassword == null) {
-            proxyPassword = AxisProperties.getProperty("http.proxyPassword");
-            if (proxyPassword == null)
-                proxyPassword = emptyString;
-        }
+        proxyPassword = AxisProperties.getProperty("http.proxyPassword");
+        if (proxyPassword == null)
+            proxyPassword = emptyString;
         return proxyPassword;
     }
 }
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
@@ -27,7 +27,7 @@
  */
 public class TransportClientPropertiesFactory {
     protected static Log log =
-            LogFactory.getLog(SocketFactoryFactory.class.getName());
+            LogFactory.getLog(TransportClientPropertiesFactory.class.getName());
     
     private static HashMap cache = new HashMap();
     private static HashMap defaults = new HashMap();
