You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sc...@apache.org on 2008/03/19 19:37:36 UTC

svn commit: r638966 - /webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java

Author: scheu
Date: Wed Mar 19 11:37:32 2008
New Revision: 638966

URL: http://svn.apache.org/viewvc?rev=638966&view=rev
Log:
AXIS-3637
Contributor:Rich Scheuerle
Tester: Huiran Wang
Quick Fix to avoid unmarshalling encrypted data

Modified:
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java?rev=638966&r1=638965&r2=638966&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBCustomBuilder.java Wed Mar 19 11:37:32 2008
@@ -101,12 +101,18 @@
         // Don't unmarshall SOAPFaults or anything else in the SOAP 
         // namespace.
         // Don't unmarshall elements that are unqualified
-        if (namespace == null || namespace.length() == 0 ||
+        if (localPart == null || namespace == null || namespace.length() == 0 ||
             SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE.equals(namespace) ||
             SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE.equals(namespace)) {
             return false;
         }
-        return true;
+       
+        // Don't unmarshal if this looks like encrypted data
+        if (localPart.equals("EncryptedData")) {
+            return false;
+        }
         
+        return true;
+                
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org