[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationU...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 25 23:19:42 2013
New Revision: 3238

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3238&view=rev
Log:
Port java-opensaml2 r1562.

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationUnmarshaller.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationUnmarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationUnmarshaller.java?rev=3238&r1=3237&r2=3238&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationUnmarshaller.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/core/impl/SubjectConfirmationUnmarshaller.java Mon Feb 25 23:19:42 2013
@@ -22,6 +22,7 @@
 import org.opensaml.saml.common.AbstractSAMLObjectUnmarshaller;
 import org.opensaml.saml.saml1.core.ConfirmationMethod;
 import org.opensaml.saml.saml1.core.SubjectConfirmation;
+import org.opensaml.xmlsec.signature.KeyInfo;
 
 /**
  * A thread-safe Unmarshaller for {@link org.opensaml.saml.saml1.core.SubjectConfirmation} objects.
@@ -36,6 +37,8 @@
 
         if (childSAMLObject instanceof ConfirmationMethod) {
             subjectConfirmation.getConfirmationMethods().add((ConfirmationMethod) childSAMLObject);
+        } else if (childSAMLObject instanceof KeyInfo) {
+            subjectConfirmation.setKeyInfo((KeyInfo)childSAMLObject);
         } else {
             subjectConfirmation.setSubjectConfirmationData(childSAMLObject);
         }