[jboss-svn-commits] JBoss Common SVN: r2179 - jbossxb/branches/JBossXB-1.0.0.CR6_JBAS-3882/src/main/org/jboss/xb/binding

[jboss-svn-commits at lists.jboss.org]

Author: darran.lofthouse at jboss.com
Date: 2006-11-24 09:45:41 -0500 (Fri, 24 Nov 2006)
New Revision: 2179

Modified:
   jbossxb/branches/JBossXB-1.0.0.CR6_JBAS-3882/src/main/org/jboss/xb/binding/SimpleTypeBindings.java
Log:
JBAS-3882 - Do not automatically unzip compressed Base64Binary data.


Modified: jbossxb/branches/JBossXB-1.0.0.CR6_JBAS-3882/src/main/org/jboss/xb/binding/SimpleTypeBindings.java
===================================================================
--- jbossxb/branches/JBossXB-1.0.0.CR6_JBAS-3882/src/main/org/jboss/xb/binding/SimpleTypeBindings.java	2006-11-24 14:35:33 UTC (rev 2178)
+++ jbossxb/branches/JBossXB-1.0.0.CR6_JBAS-3882/src/main/org/jboss/xb/binding/SimpleTypeBindings.java	2006-11-24 14:45:41 UTC (rev 2179)
@@ -28,6 +28,7 @@
 import javax.xml.namespace.NamespaceContext;
 import java.io.ByteArrayOutputStream;
 import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URISyntaxException;
@@ -1953,7 +1954,18 @@
     */
    public static byte[] unmarshalBase64(String value)
    {
-      return Base64.decode(value);
+      byte[] valueBytes;
+
+      try
+      {
+         valueBytes = value.getBytes("UTF-8");
+      }
+      catch (UnsupportedEncodingException e)
+      {
+         valueBytes = value.getBytes();
+      }
+
+      return Base64.decode(valueBytes, 0, valueBytes.length);
    }
 
    /**