ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1671067 - /webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/message/token/UsernameToken.java
Date Fri, 03 Apr 2015 13:24:32 GMT
Author: coheigea
Date: Fri Apr  3 13:24:32 2015
New Revision: 1671067

URL: http://svn.apache.org/r1671067
Log:
Also check CData


Conflicts:
	src/main/java/org/apache/ws/security/message/token/UsernameToken.java

Modified:
    webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/message/token/UsernameToken.java

Modified: webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/message/token/UsernameToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/message/token/UsernameToken.java?rev=1671067&r1=1671066&r2=1671067&view=diff
==============================================================================
--- webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/message/token/UsernameToken.java
(original)
+++ webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/message/token/UsernameToken.java
Fri Apr  3 13:24:32 2015
@@ -31,6 +31,7 @@ import org.apache.ws.security.util.WSSec
 import org.apache.ws.security.util.WSTimeSource;
 import org.apache.ws.security.util.XmlSchemaDateFormat;
 import org.apache.ws.security.util.Base64;
+import org.w3c.dom.CDATASection;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -664,6 +665,9 @@ public class UsernameToken {
                 if (Node.TEXT_NODE == node.getNodeType()) {
                     found = true;
                     builder.append(((Text)node).getData());
+                } else if (Node.CDATA_SECTION_NODE == node.getNodeType()) {
+                    found = true;
+                    builder.append(((CDATASection)node).getData());
                 }
                 node = node.getNextSibling();
             }



Mime
View raw message