Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java (revision 1421321) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java (working copy) @@ -319,7 +319,7 @@ // SELECT LENGTH, LAST_MODIFIED FROM DATASTORE WHERE ID=? rs = conHelper.query(selectMetaSQL, tempId); boolean hasNext = rs.next(); - rs.close(); + DbUtility.close(rs); rs = null; if (hasNext) { // re-try in the very, very unlikely event that the row already exists @@ -445,6 +445,8 @@ log.error(msg); throw new DataStoreException(msg); } + DbUtility.close(rs); + rs = null; touch(identifier, lastModified); // row already exists conHelper.exec(deleteSQL, tempId); @@ -537,6 +539,8 @@ } long length = rs.getLong(1); long lastModified = rs.getLong(2); + DbUtility.close(rs); + rs = null; touch(identifier, lastModified); return new DbDataRecord(this, identifier, length, lastModified); } catch (Exception e) {