[java-identity-provider COMMIT] /trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/RelyingPartyC...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Feb 20 13:29:35 2014
New Revision: 5421

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

Modified:
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/RelyingPartyContext.java

Modified: trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/RelyingPartyContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/RelyingPartyContext.java?rev=5421&r1=5420&r2=5421&view=diff
==============================================================================
--- trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/RelyingPartyContext.java (original)
+++ trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/RelyingPartyContext.java Thu Feb 20 13:29:35 2014
@@ -58,8 +58,10 @@
         
         if (relyingPartyId != null) {
             return relyingPartyId;
+        } else if (relyingPartyIdLookupStrategy != null) {
+            return relyingPartyIdLookupStrategy.apply(this);
         } else {
-            return relyingPartyIdLookupStrategy.apply(this);
+            return null;
         }
     }