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

Posted to commits@cayenne.apache.org by aa...@apache.org on 2011/02/20 13:23:02 UTC

svn commit: r1072573 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java

Author: aadamchik
Date: Sun Feb 20 12:23:02 2011
New Revision: 1072573

URL: http://svn.apache.org/viewvc?rev=1072573&view=rev
Log:
CAY-1542 DI container is not shutting down Cayenne-managed connection pool

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

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java?rev=1072573&r1=1072572&r2=1072573&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomain.java Sun Feb 20 12:23:02 2011
@@ -39,6 +39,7 @@ import org.apache.cayenne.access.jdbc.Ba
 import org.apache.cayenne.cache.NestedQueryCache;
 import org.apache.cayenne.cache.QueryCache;
 import org.apache.cayenne.configuration.ObjectContextFactory;
+import org.apache.cayenne.di.BeforeScopeEnd;
 import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.event.EventManager;
 import org.apache.cayenne.graph.CompoundDiff;
@@ -646,6 +647,7 @@ public class DataDomain implements Query
     /**
      * Shutdowns all owned data nodes and marks this domain as stopped.
      */
+    @BeforeScopeEnd
     public void shutdown() {
         if (!stopped) {
             if (sharedSnapshotCache != null) {