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 2007/01/30 22:34:17 UTC

svn commit: r501575 - in /jackrabbit/branches/1.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core: fs/db/DatabaseFileSystem.java persistence/db/DatabasePersistenceManager.java

Author: jukka
Date: Tue Jan 30 13:34:16 2007
New Revision: 501575

URL: http://svn.apache.org/viewvc?view=rev&rev=501575
Log:
1.2: Merged revision 497392 (JCR-710)

Modified:
    jackrabbit/branches/1.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java
    jackrabbit/branches/1.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java

Modified: jackrabbit/branches/1.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java?view=diff&rev=501575&r1=501574&r2=501575
==============================================================================
--- jackrabbit/branches/1.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java (original)
+++ jackrabbit/branches/1.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java Tue Jan 30 13:34:16 2007
@@ -1007,7 +1007,6 @@
         for (Iterator it = preparedStatements.values().iterator(); it.hasNext(); ) {
             closeStatement((PreparedStatement) it.next());
         }
-        preparedStatements.clear();
         try {
             closeConnection(con);
         } catch (Exception ignore) {

Modified: jackrabbit/branches/1.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java?view=diff&rev=501575&r1=501574&r2=501575
==============================================================================
--- jackrabbit/branches/1.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java (original)
+++ jackrabbit/branches/1.2/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java Tue Jan 30 13:34:16 2007
@@ -780,7 +780,6 @@
         for (Iterator it = preparedStatements.values().iterator(); it.hasNext(); ) {
             closeStatement((PreparedStatement) it.next());
         }
-        preparedStatements.clear();
         try {
             closeConnection(con);
         } catch (Exception ignore) {