Fix log typos

Address SIDP - 105

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2505 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
index 589ec5c..e35fb32 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml1/AttributeQueryProfileHandler.java
@@ -144,15 +144,15 @@ public class AttributeQueryProfileHandler extends AbstractSAML1ProfileHandler {
             requestContext.setMessageDecoder(decoder);
             decoder.decode(requestContext);
             log.debug("Decoded request");
-            
-            if (!(requestContext.getInboundMessage() instanceof Request)) {
-                log.error("Incomming message was not a Request, it was a {}", requestContext.getInboundMessage()
-                        .getClass().getName());
-                requestContext
-                        .setFailureStatus(buildStatus(StatusCode.REQUESTER, null, "Invalid SAML Request message."));
-                throw new ProfileException("Invalid SAML Request message.");
+
+            Request request = requestContext.getInboundSAMLMessage();
+            if (request == null || !(request instanceof Request) || request.getAttributeQuery() == null) {
+                log.error("Incoming message was not an Attribute request");
+                requestContext.setFailureStatus(buildStatus(StatusCode.REQUESTER, null,
+                        "Invalid SAML Attribute Request message."));
+                throw new ProfileException("Invalid SAML Attribute Request message.");
             }
-            
+
             return requestContext;
         } catch (MessageDecodingException e) {
             log.error("Error decoding attribute query message", e);

diff --git a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
index 9a6da96..6de59f6 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/profile/saml2/AttributeQueryProfileHandler.java
@@ -145,15 +145,15 @@ public class AttributeQueryProfileHandler extends AbstractSAML2ProfileHandler {
             requestContext.setMessageDecoder(decoder);
             decoder.decode(requestContext);
             log.debug("Decoded request");
-            
-            if (!(requestContext.getInboundMessage() instanceof AttributeQuery)) {
-                log.error("Incomming message was not a AttributeQuery, it was a {}", requestContext.getInboundMessage()
-                        .getClass().getName());
+
+            if (!(requestContext.getInboundSAMLMessage() instanceof AttributeQuery)) {
+                log.error("Incoming message was not a AttributeQuery, it was a {}", requestContext
+                        .getInboundSAMLMessage().getClass().getName());
                 requestContext.setFailureStatus(buildStatus(StatusCode.REQUESTER_URI, null,
                         "Invalid SAML AttributeQuery message."));
                 throw new ProfileException("Invalid SAML AttributeQuery message.");
             }
-            
+
             return requestContext;
         } catch (MessageDecodingException e) {
             log.error("Error decoding attribute query message", e);