You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cayenne.apache.org by ol...@apache.org on 2012/02/22 17:53:16 UTC

svn commit: r1292395 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCache.java

Author: oltka
Date: Wed Feb 22 16:53:16 2012
New Revision: 1292395

URL: http://svn.apache.org/viewvc?rev=1292395&view=rev
Log:
CAY-1671 Manually shutting down OSQueryCache

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCache.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCache.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCache.java?rev=1292395&r1=1292394&r2=1292395&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCache.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/cache/OSQueryCache.java Wed Feb 22 16:53:16 2012
@@ -26,6 +26,7 @@ import java.util.Map;
 import java.util.Properties;
 
 import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.di.BeforeScopeEnd;
 import org.apache.cayenne.query.QueryMetadata;
 
 import com.opensymphony.oscache.base.CacheEntry;
@@ -358,6 +359,14 @@ public class OSQueryCache implements Que
     public int capacity() {
         return osCache.getCache().getCapacity();
     }
+    
+    /**
+     * Shuts down EhCache CacheManager
+     */
+    @BeforeScopeEnd
+    public void shutdown() {
+        osCache.destroy();
+    }
 
     final static class RefreshSpecification {