svn commit: r1340086 - /cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java

[sergeyb]

Author: sergeyb
Date: Fri May 18 12:57:55 2012
New Revision: 1340086

URL: http://svn.apache.org/viewvc?rev=1340086&view=rev
Log:
Minor update to the domain check given that the property is optional

Modified:
    
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java

Modified: 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java?rev=1340086&r1=1340085&r2=1340086&view=diff
==============================================================================
--- 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
 (original)
+++ 
cxf/trunk/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
 Fri May 18 12:57:55 2012
@@ -176,7 +176,9 @@ public abstract class AbstractServicePro
             return null;
         }
         String webAppContext = getWebAppContext(m);
-        if (webAppDomain != null && 
!webAppDomain.equals(responseState.getWebAppDomain())
+        if (webAppDomain != null 
+            && (responseState.getWebAppDomain() == null 
+                || !webAppDomain.equals(responseState.getWebAppDomain()))
             || responseState.getWebAppContext() == null
             || !webAppContext.equals(responseState.getWebAppContext())) {
             getStateProvider().removeResponseState(contextKey);