You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by dk...@apache.org on 2011/08/25 15:27:40 UTC

svn commit: r1161558 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache: EhCacheQueryCacheProvider.java MapQueryCacheProvider.java OSQueryCacheProvider.java QueryCacheLazyInitializationProxy.java

Author: dkazimirchyk
Date: Thu Aug 25 13:27:40 2011
New Revision: 1161558

URL: http://svn.apache.org/viewvc?rev=1161558&view=rev
Log:
CAY-1537 Implement ObjectContext local caches as NestedQueryCache over the shared cache

removed QueryCacheLazyInitializationProxy and some cache providers that became useless now

Removed:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/EhCacheQueryCacheProvider.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCacheProvider.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/QueryCacheLazyInitializationProxy.java
Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheProvider.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheProvider.java?rev=1161558&r1=1161557&r2=1161558&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheProvider.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/MapQueryCacheProvider.java Thu Aug 25 13:27:40 2011
@@ -38,14 +38,9 @@ public class MapQueryCacheProvider imple
 
     public QueryCache get() throws ConfigurationException {
 
-        return new QueryCacheLazyInitializationProxy(new Provider<QueryCache>() {
-
-            public QueryCache get() throws ConfigurationException {
-                int size = properties.getInt(
-                        CACHE_SIZE_PROPERTY,
-                        MapQueryCache.DEFAULT_CACHE_SIZE);
-                return new MapQueryCache(size);
-            }
-        });
+        int size = properties.getInt(
+                CACHE_SIZE_PROPERTY,
+                MapQueryCache.DEFAULT_CACHE_SIZE);
+        return new MapQueryCache(size);
     }
 }