Author: rmannibucau
Date: Fri Aug 7 01:32:10 2015
New Revision: 1694602
URL: http://svn.apache.org/r1694602
Log:
JCS-151 ensuring default generator is accurately instantiated even in default
case
Modified:
commons/proper/jcs/trunk/commons-jcs-jcache/src/main/java/org/apache/commons/jcs/jcache/cdi/CDIJCacheHelper.java
commons/proper/jcs/trunk/pom.xml
Modified:
commons/proper/jcs/trunk/commons-jcs-jcache/src/main/java/org/apache/commons/jcs/jcache/cdi/CDIJCacheHelper.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-jcache/src/main/java/org/apache/commons/jcs/jcache/cdi/CDIJCacheHelper.java?rev=1694602&r1=1694601&r2=1694602&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-jcache/src/main/java/org/apache/commons/jcs/jcache/cdi/CDIJCacheHelper.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-jcache/src/main/java/org/apache/commons/jcs/jcache/cdi/CDIJCacheHelper.java
Fri Aug 7 01:32:10 2015
@@ -150,7 +150,7 @@ public class CDIJCacheHelper
if (defaults != null)
{
final Class<? extends CacheKeyGenerator> defaultCacheKeyGenerator
= defaults.cacheKeyGenerator();
- if (!CacheResolverFactory.class.equals(defaultCacheKeyGenerator))
+ if (!CacheKeyGenerator.class.equals(defaultCacheKeyGenerator))
{
return instance(defaultCacheKeyGenerator);
}
Modified: commons/proper/jcs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/pom.xml?rev=1694602&r1=1694601&r2=1694602&view=diff
==============================================================================
--- commons/proper/jcs/trunk/pom.xml (original)
+++ commons/proper/jcs/trunk/pom.xml Fri Aug 7 01:32:10 2015
@@ -558,7 +558,7 @@
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-impl</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.1</version>
<scope>test</scope>
</dependency>
