You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/04/22 03:16:11 UTC
svn commit: r650342 -
/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java
Author: jukka
Date: Mon Apr 21 18:16:03 2008
New Revision: 650342
URL: http://svn.apache.org/viewvc?rev=650342&view=rev
Log:
1.4: Merged revision 640792 (JCR-1499)
Modified:
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java?rev=650342&r1=650341&r2=650342&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/DerbyPersistenceManager.java Mon Apr 21 18:16:03 2008
@@ -329,6 +329,8 @@
// @todo further investigate
connectionManager.getConnection().setAutoCommit(true);
+ super.close();
+
// now it's safe to shutdown the embedded Derby database
try {
DriverManager.getConnection(url);
@@ -336,8 +338,6 @@
// a shutdown command always raises a SQLException
log.info(e.getMessage());
}
-
- super.close();
}
}