svn commit: r1526890 - /webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/SamlAssertionValidator.java

[co...@apache.org]

Author: coheigea
Date: Fri Sep 27 13:13:45 2013
New Revision: 1526890

URL: http://svn.apache.org/r1526890
Log:
Only create the SAML OneTimeUse Cache if needed.


Conflicts:
	ws-security-dom/src/test/java/org/apache/wss4j/dom/common/SecurityTestUtil.java

Modified:
    webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/SamlAssertionValidator.java

Modified: webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/SamlAssertionValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/SamlAssertionValidator.java?rev=1526890&r1=1526889&r2=1526890&view=diff
==============================================================================
--- webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/SamlAssertionValidator.java (original)
+++ webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/validate/SamlAssertionValidator.java Fri Sep 27 13:13:45 2013
@@ -170,10 +170,10 @@ public class SamlAssertionValidator exte
     protected void checkOneTimeUse(
         AssertionWrapper samlAssertion, RequestData data
     ) throws WSSecurityException {
-        if (data.getSamlOneTimeUseReplayCache() != null
-            && samlAssertion.getSamlVersion().equals(SAMLVersion.VERSION_20)
+        if (samlAssertion.getSamlVersion().equals(SAMLVersion.VERSION_20)
             && samlAssertion.getSaml2().getConditions() != null
-            && samlAssertion.getSaml2().getConditions().getOneTimeUse() != null) {
+            && samlAssertion.getSaml2().getConditions().getOneTimeUse() != null 
+            && data.getSamlOneTimeUseReplayCache() != null) {
             String identifier = samlAssertion.getId();
 
             ReplayCache replayCache = data.getSamlOneTimeUseReplayCache();