Return-Path: 
 <commits-return-47501-apmail-commons-commits-archive=commons.apache.org@commons.apache.org>
X-Original-To: apmail-commons-commits-archive@minotaur.apache.org
Delivered-To: apmail-commons-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 66CF218AF9
	for <apmail-commons-commits-archive@minotaur.apache.org>;
 Fri,  7 Aug 2015 01:32:11 +0000 (UTC)
Received: (qmail 83988 invoked by uid 500); 7 Aug 2015 01:32:11 -0000
Delivered-To: apmail-commons-commits-archive@commons.apache.org
Received: (qmail 83908 invoked by uid 500); 7 Aug 2015 01:32:11 -0000
Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@commons.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@commons.apache.org>
List-Post: <mailto:commits@commons.apache.org>
List-Id: <commits.commons.apache.org>
Reply-To: dev@commons.apache.org
Delivered-To: mailing list commits@commons.apache.org
Received: (qmail 83899 invoked by uid 99); 7 Aug 2015 01:32:11 -0000
Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Aug 2015 01:32:11 +0000
Received: from hades.apache.org (localhost [127.0.0.1])
	by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id
 1678AAC01A7
	for <commits@commons.apache.org>; Fri,  7 Aug 2015 01:32:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1694602 - in /commons/proper/jcs/trunk:
 commons-jcs-jcache/src/main/java/org/apache/commons/jcs/jcache/cdi/CDIJCacheHelper.java
 pom.xml
Date: Fri, 07 Aug 2015 01:32:10 -0000
To: commits@commons.apache.org
From: rmannibucau@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20150807013211.1678AAC01A7@hades.apache.org>

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>