[axis-axis1-java] branch master updated: Revert "AXIS-2295 Apply community suggested fixes to http proxy parameters caching mechanism"

[veithen]

This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git


The following commit(s) were added to refs/heads/master by this push:
     new 1cd08d4  Revert "AXIS-2295 Apply community suggested fixes to http 
proxy parameters caching mechanism"
1cd08d4 is described below

commit 1cd08d453ebb17ab6fc0fde05cecbdf24c296bc0
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Sun Dec 20 12:09:00 2020 +0000

    Revert "AXIS-2295 Apply community suggested fixes to http proxy parameters 
caching mechanism"
    
    That change causes a test failure in 
test.wsdl.multithread.MultithreadTestCase.
    
    This reverts commit a596f2cd4672bfb0c7ce02762c55c6c3eb21e440.
---
 .../net/DefaultHTTPTransportClientProperties.java  | 40 ++++++++++++++--------
 .../net/TransportClientPropertiesFactory.java      |  2 +-
 2 files changed, 26 insertions(+), 16 deletions(-)

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
index 6cd5519..44784bd 100644
--- 
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,9 +37,11 @@ public class DefaultHTTPTransportClientProperties
      * @see 
org.apache.axis.components.net.TransportClientProperties#getProxyHost()
      */
     public String getProxyHost() {
-        proxyHost = AxisProperties.getProperty("http.proxyHost");
-        if (proxyHost == null)
-            proxyHost = emptyString;
+        if (proxyHost == null) {
+            proxyHost = AxisProperties.getProperty("http.proxyHost");
+            if (proxyHost == null)
+                proxyHost = emptyString;
+        }
         return proxyHost;
     }
 
@@ -47,9 +49,11 @@ public class DefaultHTTPTransportClientProperties
      * @see 
org.apache.axis.components.net.TransportClientProperties#getNonProxyHosts()
      */
     public String getNonProxyHosts() {
-        nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
-        if (nonProxyHosts == null)
-            nonProxyHosts = emptyString;
+        if (nonProxyHosts == null) {
+            nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
+            if (nonProxyHosts == null)
+                nonProxyHosts = emptyString;
+        }
         return nonProxyHosts;
     }
 
@@ -57,9 +61,11 @@ public class DefaultHTTPTransportClientProperties
      * @see 
org.apache.axis.components.net.TransportClientProperties#getProxyPort()
      */
     public String getProxyPort() {
-        proxyPort = AxisProperties.getProperty("http.proxyPort");
-        if (proxyPort == null)
-            proxyPort = emptyString;
+        if (proxyPort == null) {
+            proxyPort = AxisProperties.getProperty("http.proxyPort");
+            if (proxyPort == null)
+                proxyPort = emptyString;
+        }
         return proxyPort;
     }
 
@@ -67,9 +73,11 @@ public class DefaultHTTPTransportClientProperties
      * @see 
org.apache.axis.components.net.TransportClientProperties#getProxyUser()
      */
     public String getProxyUser() {
-        proxyUser = AxisProperties.getProperty("http.proxyUser");
-        if (proxyUser == null)
-            proxyUser = emptyString;
+        if (proxyUser == null) {
+            proxyUser = AxisProperties.getProperty("http.proxyUser");
+            if (proxyUser == null)
+                proxyUser = emptyString;
+        }
         return proxyUser;
     }
 
@@ -77,9 +85,11 @@ public class DefaultHTTPTransportClientProperties
      * @see 
org.apache.axis.components.net.TransportClientProperties#getProxyPassword()
      */
     public String getProxyPassword() {
-        proxyPassword = AxisProperties.getProperty("http.proxyPassword");
-        if (proxyPassword == null)
-            proxyPassword = emptyString;
+        if (proxyPassword == null) {
+            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
index 7aed0ba..7a8ad63 100644
--- 
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 @@ import java.util.HashMap;
  */
 public class TransportClientPropertiesFactory {
     protected static Log log =
-            
LogFactory.getLog(TransportClientPropertiesFactory.class.getName());
+            LogFactory.getLog(SocketFactoryFactory.class.getName());
     
     private static HashMap cache = new HashMap();
     private static HashMap defaults = new HashMap();