Author: robertlazarski Date: Thu Mar 19 14:46:35 2020 New Revision: 1875428
URL: http://svn.apache.org/viewvc?rev=1875428&view=rev Log: AXIS-2295 Apply community suggested fixes to http proxy parameters caching mechanism Modified: axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java Modified: axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java?rev=1875428&r1=1875427&r2=1875428&view=diff ============================================================================== --- axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java (original) +++ axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java Thu Mar 19 14:46:35 2020 @@ -37,11 +37,9 @@ public class DefaultHTTPTransportClientP * @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; } @@ -49,11 +47,9 @@ public class DefaultHTTPTransportClientP * @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; } @@ -61,11 +57,9 @@ public class DefaultHTTPTransportClientP * @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; } @@ -73,11 +67,9 @@ public class DefaultHTTPTransportClientP * @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; } @@ -85,11 +77,9 @@ public class DefaultHTTPTransportClientP * @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; } } Modified: axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java?rev=1875428&r1=1875427&r2=1875428&view=diff ============================================================================== --- axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java (original) +++ axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java Thu Mar 19 14:46:35 2020 @@ -27,7 +27,7 @@ import java.util.HashMap; */ 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();
