You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2012/03/08 16:29:01 UTC

svn commit: r1298429 - in /webservices/wss4j/trunk/src: main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java

Author: coheigea
Date: Thu Mar  8 15:29:00 2012
New Revision: 1298429

URL: http://svn.apache.org/viewvc?rev=1298429&view=rev
Log:
Fixing a bug with AssertionWrapper.assertionToString

Modified:
    webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
    webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java

Modified: webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java?rev=1298429&r1=1298428&r2=1298429&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java (original)
+++ webservices/wss4j/trunk/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java Thu Mar  8 15:29:00 2012
@@ -294,8 +294,11 @@ public class AssertionWrapper {
      * @return String
      */
     public String assertionToString() throws WSSecurityException {
-        Element element = toDOM(null);
-        return DOM2Writer.nodeToString(element);
+        if (assertionElement == null) {
+            Element element = toDOM(null);
+            return DOM2Writer.nodeToString(element);
+        }
+        return DOM2Writer.nodeToString(assertionElement);
     }
 
     /**

Modified: webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java?rev=1298429&r1=1298428&r2=1298429&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java (original)
+++ webservices/wss4j/trunk/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java Thu Mar  8 15:29:00 2012
@@ -94,6 +94,7 @@ public class SamlTokenHOKTest extends or
             (AssertionWrapper) actionResult.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
         assertTrue(receivedAssertion != null);
         assertTrue(receivedAssertion.isSigned());
+        assertNotNull(receivedAssertion.assertionToString());
     }
     
     /**