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 sc...@apache.org on 2010/09/09 14:52:25 UTC

svn commit: r995408 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java

Author: scheu
Date: Thu Sep  9 12:52:24 2010
New Revision: 995408

URL: http://svn.apache.org/viewvc?rev=995408&view=rev
Log:
Quick Fix to remove Exception.
This exception violates WS-I Basic Profile Rule 1019

Modified:
    axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java

Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=995408&r1=995407&r2=995408&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java Thu Sep  9 12:52:24 2010
@@ -785,6 +785,9 @@ public class BuilderUtil {
             && (charsetEncodingFromTransport != null)
             && !charsetEncodingFromXML.equalsIgnoreCase(charsetEncodingFromTransport)
             && !compatibleEncodings(charsetEncodingFromXML, charsetEncodingFromTransport)) {
+            /**
+             * WS-BP Rule 1019 requires toleration if the character sets mismatch
+             * I am changing this to simply a debug statement.
             String faultCode;
 
             if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(soapNamespaceURI)) {
@@ -794,10 +797,14 @@ public class BuilderUtil {
             }
 
             throw new AxisFault("Character Set Encoding from "
-                                + "transport information [" + charsetEncodingFromTransport +
-                                "] does not match with "
-                                + "character set encoding in the received SOAP message [" +
-                                charsetEncodingFromXML + "]", faultCode);
+                    + "transport information [" + charsetEncodingFromTransport + "] does not match with "
+                    + "character set encoding in the received SOAP message [" + charsetEncodingFromXML + "]", faultCode);
+            **/
+            if (log.isDebugEnabled()) {
+                log.debug("Character Set Encoding from "
+                        + "transport information [" + charsetEncodingFromTransport + "] does not match with "
+                        + "character set encoding in the received SOAP message [" + charsetEncodingFromXML + "]");
+            }
         }
     }