You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by sa...@apache.org on 2012/07/17 09:22:26 UTC

svn commit: r1362388 - 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: sagara
Date: Tue Jul 17 07:22:26 2012
New Revision: 1362388

URL: http://svn.apache.org/viewvc?rev=1362388&view=rev
Log:
Fixed AXIS2-5170- Can't find such constrain on http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/#normalizedString.

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=1362388&r1=1362387&r2=1362388&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 Tue Jul 17 07:22:26 2012
@@ -676,7 +676,7 @@ public class ConverterUtil {
 
 
     public static NormalizedString convertToNormalizedString(String s) {
-        if ((s == null) || s.equals("")){
+        if ((s == null)){
             return null;
         }
         return new NormalizedString(s);

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=1362388&r1=1362387&r2=1362388&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 Tue Jul 17 07:22:26 2012
@@ -35,6 +35,7 @@ import javax.activation.DataSource;
 
 import org.apache.axiom.attachments.ByteArrayDataSource;
 import org.apache.axiom.om.util.Base64;
+import org.apache.axis2.databinding.types.NormalizedString;
 
 public class ConverterUtilTest extends TestCase {
 
@@ -548,6 +549,16 @@ public class ConverterUtilTest extends T
                      0,
                      calendar.get(Calendar.ZONE_OFFSET)+calendar.get(Calendar.DST_OFFSET));        
     }
+    
+    public void testConvertToNormalizedString() {
+        NormalizedString str = ConverterUtil.convertToNormalizedString("abc");
+        assertNotNull(str);      
+        str = ConverterUtil.convertToNormalizedString("");
+        assertNotNull(str);
+        str = ConverterUtil.convertToNormalizedString(null);
+        assertNull(str);      
+
+    }
 
 
 }