[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resol...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jan  6 06:42:16 2017
New Revision: 8595

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8595&view=rev
Log:
IDP-1093 New attributes to control TTL policy

https://issues.shibboleth.net/jira/browse/IDP-1093

Clean up logic so that the default is as before (Last used, First Out)

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java?rev=8595&r1=8594&r2=8595&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/CacheConfigParser.java	Fri Jan  6 06:42:16 2017
@@ -115,25 +115,21 @@
         }
         final String expireAfterWrite = AttributeSupport.getAttributeValue(cacheElement, new QName("expireAfterWrite"));
         final String expireAfterAccess = AttributeSupport.getAttributeValue(cacheElement, new QName("expireAfterAccess"));
-
-        if (null != expireAfterAccess && null != expireAfterWrite) {
-            log.warn("ResultCache:  Attribute 'expireAfterAccess' is mututally exclusive with 'expireAfterWrite'");
-        }
         
         final BeanDefinitionBuilder cache;
-        if (expireAfterAccess != null) {
-            cache = BeanDefinitionBuilder.rootBeanDefinition(CacheConfigParser.class, "buildCacheAccess");            
-            cache.addConstructorArgValue(expireAfterAccess);
+        if (expireAfterWrite != null) {
+            if (null != expireAfterAccess || null != elementTimeToLive) {
+                log.warn("ResultCache:  Attribute 'expireAfterAccess' is mututally exclusive with 'expireAfterWrite'. Used 'expireAfterWrite'.");
+            }
+            cache = BeanDefinitionBuilder.rootBeanDefinition(CacheConfigParser.class, "buildCacheWrite");            
+            cache.addConstructorArgValue(expireAfterWrite);            
         } else if (elementTimeToLive != null) {
             cache = BeanDefinitionBuilder.rootBeanDefinition(CacheConfigParser.class, "buildCacheAccess");            
             cache.addConstructorArgValue(elementTimeToLive);
-        } else if (expireAfterWrite != null) {
-            cache = BeanDefinitionBuilder.rootBeanDefinition(CacheConfigParser.class, "buildCacheWrite");            
-            cache.addConstructorArgValue(expireAfterWrite);            
         } else {
-            cache = BeanDefinitionBuilder.rootBeanDefinition(CacheConfigParser.class, "buildCacheWrite");            
-            cache.addConstructorArgValue(null);                        
-        }
+            cache = BeanDefinitionBuilder.rootBeanDefinition(CacheConfigParser.class, "buildCacheAccess");            
+            cache.addConstructorArgValue(expireAfterAccess);
+        } 
         cache.addConstructorArgValue(
                 AttributeSupport.getAttributeValue(cacheElement, new QName("maximumCachedElements")));
         return cache.getBeanDefinition();