You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2007/01/18 11:54:40 UTC
svn commit: r497392 - in
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core:
fs/db/DatabaseFileSystem.java persistence/db/DatabasePersistenceManager.java
Author: stefan
Date: Thu Jan 18 02:54:40 2007
New Revision: 497392
URL: http://svn.apache.org/viewvc?view=rev&rev=497392
Log:
JCR-710: NullPointerException in DatabasePersistenceManager and DatabaseFileSystem after a failed reconnection attempt
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java?view=diff&rev=497392&r1=497391&r2=497392
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/DatabaseFileSystem.java Thu Jan 18 02:54:40 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/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java?view=diff&rev=497392&r1=497391&r2=497392
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java Thu Jan 18 02:54:40 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) {