[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/saml1/core/impl/SubjectC...

[noreply at shibboleth.net]

Author: lajoie
Date: Tue Feb 21 14:08:33 2012
New Revision: 1562

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1562&view=rev
Log:
Properly detect SubjectConfirmation/KeyInfo and place the element in the write bean property - JOST-176

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/saml1/core/impl/SubjectConfirmationUnmarshaller.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1562&r1=1561&r2=1562&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Tue Feb 21 14:08:33 2012
@@ -1,5 +1,6 @@
 Changes in Release 2.5.3
 =============================================
+[JOST-176] - SubjectConfirmationUnmarshaller processChildElement misplaces KeyInfo
 [JOST-179] - FileBackedHTTPMetadataProvider does not properly release HTTP connections
 [JOST-180] - Update openws library version
 

Modified: branches/REL_2/src/main/java/org/opensaml/saml1/core/impl/SubjectConfirmationUnmarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml1/core/impl/SubjectConfirmationUnmarshaller.java?rev=1562&r1=1561&r2=1562&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml1/core/impl/SubjectConfirmationUnmarshaller.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml1/core/impl/SubjectConfirmationUnmarshaller.java Tue Feb 21 14:08:33 2012
@@ -22,6 +22,7 @@
 import org.opensaml.saml1.core.SubjectConfirmation;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.io.UnmarshallingException;
+import org.opensaml.xml.signature.KeyInfo;
 
 /**
  * A thread-safe Unmarshaller for {@link org.opensaml.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);
         }