### Eclipse Workspace Patch 1.0 #P jackrabbit-core Index: src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java (revision 1532975) +++ src/main/java/org/apache/jackrabbit/core/persistence/pool/BundleDbPersistenceManager.java (working copy) @@ -928,7 +928,7 @@ } finally { in.close(); } - } catch (Exception e) { + } catch (IOException e) { SQLException exception = new SQLException("Failed to parse bundle " + id); exception.initCause(e); Index: src/main/java/org/apache/jackrabbit/core/TransactionContext.java =================================================================== --- src/main/java/org/apache/jackrabbit/core/TransactionContext.java (revision 1467898) +++ src/main/java/org/apache/jackrabbit/core/TransactionContext.java (working copy) @@ -144,6 +144,9 @@ } catch (TransactionException e) { txe = e; break; + } catch (Exception e) { + txe = new TransactionException("Error while preparing resource " + resources, e); + break; } } @@ -187,7 +190,7 @@ 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 @@ heuristicCommit = true; } catch (TransactionException e) { txe = e; + } catch (Exception e) { + txe = new TransactionException("Error while committing resource " + resource, e); } } } @@ -234,7 +239,7 @@ InternalXAResource resource = resources[i]; try { resource.rollback(this); - } catch (TransactionException e) { + } catch (Exception e) { log.warn("Unable to rollback changes on " + resource, e); errors++; }