(axis-axis2-java-core) branch master updated: Properly fix AXIS2-6068

[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-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 760bb91d67 Properly fix AXIS2-6068
760bb91d67 is described below

commit 760bb91d67ea589b5553a80b03195cfe4eb5d623
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Sun Jun 16 09:20:07 2024 +0000

    Properly fix AXIS2-6068
---
 modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java  | 3 ++-
 .../adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java 
b/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
index 485bdb1b94..ac6e5d947a 100644
--- a/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
+++ b/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
@@ -87,6 +87,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.List;
+import java.util.Locale;
 import java.util.TimeZone;
 
 /**
@@ -1350,7 +1351,7 @@ public class ConverterUtil {
         //AXIS2-5724 - Handle Decimal String value when casting to Long.
         long param;
         try {
-            NumberFormat nf = NumberFormat.getInstance();
+            NumberFormat nf = NumberFormat.getInstance(Locale.US);
             param = nf.parse(value).longValue();
         } catch (Exception e) {
             throw new ObjectConversionException(e);
diff --git 
a/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java 
b/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
index 0da24c50a4..4692441561 100644
--- a/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
+++ b/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
@@ -30,7 +30,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 import java.util.TimeZone;
 
 import jakarta.activation.DataHandler;
@@ -570,8 +569,6 @@ public class ConverterUtilTest extends TestCase {
 
     public void 
testCompareBigIntegerValueIsLessThanTotalDigitsFacetRestriction() {
         //AXIS2-5724 - Handle Decimal String value when casting to Long.
-        //AXIS2-6068 - ConverterUtilTest is locale-dependent
-        Locale.setDefault(Locale.US);
         BigInteger value = BigInteger.valueOf(100L);
         String totalDigitsFromXsd = "3";
         String decimalNotationString = 
ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();