[java-opensaml COMMIT] /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLSubjectN...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Mar 21 13:51:20 2014
New Revision: 3720

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3720&view=rev
Log:
SAML 1 queries live below parent Request.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLSubjectNameIdentifierContext.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLSubjectNameIdentifierContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLSubjectNameIdentifierContext.java?rev=3720&r1=3719&r2=3720&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLSubjectNameIdentifierContext.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/SAMLSubjectNameIdentifierContext.java Fri Mar 21 13:51:20 2014
@@ -23,6 +23,7 @@
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.saml.common.SAMLObject;
 import org.opensaml.saml.saml1.core.NameIdentifier;
+import org.opensaml.saml.saml1.core.Request;
 import org.opensaml.saml.saml2.core.NameID;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -149,9 +150,8 @@
             } else {
                 return null;
             }
-        } else if (samlMessage instanceof org.opensaml.saml.saml1.core.SubjectQuery) {
-            final org.opensaml.saml.saml1.core.SubjectQuery query = 
-                    (org.opensaml.saml.saml1.core.SubjectQuery) samlMessage;
+        } else if (samlMessage instanceof Request && ((Request) samlMessage).getSubjectQuery() != null) {
+            final org.opensaml.saml.saml1.core.SubjectQuery query = ((Request) samlMessage).getSubjectQuery();
             if (query.getSubject() != null) {
                 return query.getSubject().getNameIdentifier();
             } else {