You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ck...@apache.org on 2013/10/28 09:08:10 UTC
svn commit: r1536281 - in
/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core:
TransactionContext.java persistence/pool/BundleDbPersistenceManager.java
Author: ckoell
Date: Mon Oct 28 08:08:09 2013
New Revision: 1536281
URL: http://svn.apache.org/r1536281
Log:
JCR-3682 Better Exception Handling in TransactionContext to handle unchecked exceptions
Modified:
jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java
jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java
Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java?rev=1536281&r1=1536280&r2=1536281&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/TransactionContext.java Mon Oct 28 08:08:09 2013
@@ -144,6 +144,9 @@ public class TransactionContext {
} catch (TransactionException e) {
txe = e;
break;
+ } catch (Exception e) {
+ txe = new TransactionException("Error while preparing resource " + resources, e);
+ break;
}
}
@@ -187,7 +190,7 @@ public class TransactionContext {
if (txe != null) {
try {
resource.rollback(this);
- } catch (TransactionException e) {
+ } catch (Exception e) {
log.warn("Unable to rollback changes on " + resource, e);
}
} else {
@@ -196,6 +199,8 @@ public class TransactionContext {
heuristicCommit = true;
} catch (TransactionException e) {
txe = e;
+ } catch (Exception e) {
+ txe = new TransactionException("Error while committing resource " + resource, e);
}
}
}
@@ -234,7 +239,7 @@ public class TransactionContext {
InternalXAResource resource = resources[i];
try {
resource.rollback(this);
- } catch (TransactionException e) {
+ } catch (Exception e) {
log.warn("Unable to rollback changes on " + resource, e);
errors++;
}
Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java?rev=1536281&r1=1536280&r2=1536281&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java Mon Oct 28 08:08:09 2013
@@ -928,7 +928,7 @@ public class BundleDbPersistenceManager
} finally {
in.close();
}
- } catch (Exception e) {
+ } catch (IOException e) {
SQLException exception =
new SQLException("Failed to parse bundle " + id);
exception.initCause(e);