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 2012/08/03 11:36:41 UTC
svn commit: r1368847 - in /jackrabbit/branches/2.4: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java
Author: jukka
Date: Fri Aug 3 09:36:41 2012
New Revision: 1368847
URL: http://svn.apache.org/viewvc?rev=1368847&view=rev
Log:
2.4: Merged revision 1360571 (JCR-3383)
Modified:
jackrabbit/branches/2.4/ (props changed)
jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java
jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java
Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1360571
Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java?rev=1368847&r1=1368846&r2=1368847&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java Fri Aug 3 09:36:41 2012
@@ -496,7 +496,7 @@ public class BundleDbPersistenceManager
}
failures++;
log.error("Failed to persist ChangeLog (stacktrace on DEBUG log level), blockOnConnectionLoss = "
- + blockOnConnectionLoss, lastException);
+ + blockOnConnectionLoss + ": " + lastException);
log.debug("Failed to persist ChangeLog", lastException);
if (blockOnConnectionLoss || failures <= 1) { // if we're going to try again
try {
@@ -827,13 +827,15 @@ public class BundleDbPersistenceManager
ResultSet rs =
conHelper.exec(bundleSelectSQL, getKey(id), false, 0);
try {
- if (rs.next()) {
+ if (rs != null && rs.next()) {
return readBundle(id, rs, 1);
} else {
return null;
}
} finally {
- rs.close();
+ if (rs != null) {
+ rs.close();
+ }
}
} catch (SQLException e) {
String msg = "failed to read bundle: " + id + ": " + e;
Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java?rev=1368847&r1=1368846&r2=1368847&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java Fri Aug 3 09:36:41 2012
@@ -399,6 +399,7 @@ public class ConnectionHelper {
}
// Don't wrap null
if (rs == null) {
+ closeResources(con, stmt, rs);
return null;
}
if (inBatchMode()) {
@@ -494,7 +495,7 @@ public class ConnectionHelper {
} catch (SQLException e) {
lastException = e;
}
- log.error("Failed to execute SQL (stacktrace on DEBUG log level)", lastException);
+ log.error("Failed to execute SQL (stacktrace on DEBUG log level): " + lastException);
log.debug("Failed to execute SQL", lastException);
failures++;
if (blockOnConnectionLoss || failures <= RETRIES) { // if we're going to try again