svn commit: r1875428 - in /axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/net: DefaultHTTPTransportClientProperties.java TransportClientPropertiesFactory.java
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(
svn commit: r1875438 - in /axis/axis2/java/core/trunk/modules/adb: src/org/apache/axis2/databinding/utils/ConverterUtil.java test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
Author: robertlazarski
Date: Thu Mar 19 22:54:34 2020
New Revision: 1875438
URL: http://svn.apache.org/viewvc?rev=1875438&view=rev
Log:
AXIS2-5724 Apply patch from community, to ADB ConverterUtil class
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=1875438&r1=1875437&r2=1875438&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
Thu Mar 19 22:54:34 2020
@@ -79,6 +79,8 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.text.NumberFormat;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -1344,7 +1346,15 @@ public class ConverterUtil {
* @return 0 if equal , + value if greater than , - value if less than
*/
public static long compare(BigInteger binBigInteger, String value) {
-return binBigInteger.longValue() - Long.parseLong(value);
+//AXIS2-5724 - Handle Decimal String value when casting to Long.
+long param;
+try {
+NumberFormat nf = NumberFormat.getInstance();
+param = nf.parse(value).longValue();
+} catch (Exception e) {
+throw new ObjectConversionException(e);
+}
+return binBigInteger.longValue() - param;
}
/**
Modified:
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java?rev=1875438&r1=1875437&r2=1875438&view=diff
==
---
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
Thu Mar 19 22:54:34 2020
@@ -566,4 +566,21 @@ public class ConverterUtilTest extends T
//
https://stackoverflow.com/questions/46372764/axis2-adb-and-mininclusive-2147483648
assertThat(ConverterUtil.compare(3, "-2147483648")).isGreaterThan(0);
}
+
+public void
testCompareBigIntegerValueIsLessThanTotalDigitsFacetRestriction() {
+//AXIS2-5724 - Handle Decimal String value when casting to Long.
+BigInteger value = BigInteger.valueOf(100L);
+String totalDigitsFromXsd = "3";
+String decimalNotationString =
ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();
+assertThat(ConverterUtil.compare(value,
decimalNotationString)).isLessThan(0L);
+}
+
+public void
testCompareBigIntegerValueIsGreaterThanOrEqualToTotalDigitsFacetRestriction() {
+//AXIS2-5724 - Handle Decimal String value when casting to Long.
+BigInteger value = BigInteger.valueOf(1000L);
+String totalDigitsFromXsd = "3";
+String decimalNotationString =
ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();
+long result = ConverterUtil.compare(value, decimalNotationString);
+assertThat(result).isAtLeast(0L);
+}
}
