[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeOut...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Apr 30 14:17:37 2014
New Revision: 5809

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5809&view=rev
Log:
Fix an NPE.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeOutboundMessageContextForError.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeOutboundMessageContextForError.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeOutboundMessageContextForError.java?rev=5809&r1=5808&r2=5809&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeOutboundMessageContextForError.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeOutboundMessageContextForError.java Wed Apr 30 14:17:37 2014
@@ -168,7 +168,10 @@
             return;
         }
         
-        bindingCtx.setRelayState(SAMLBindingSupport.getRelayState(profileRequestContext.getInboundMessageContext()));
+        if (profileRequestContext.getInboundMessageContext() != null) {
+            bindingCtx.setRelayState(SAMLBindingSupport.getRelayState(
+                    profileRequestContext.getInboundMessageContext()));
+        }
         bindingCtx.setBindingUri(outboundBinding);
                 
         // Copy SAML peer context and metadata if it exists.