summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2014-10-01 15:45:50 +0000
committerKeith Wall <kwall@apache.org>2014-10-01 15:45:50 +0000
commitf84ed512e919a6c717cbdbcc22e8139bc64bc205 (patch)
tree4b15a4239081a880360e0d29ecfaf1f8ba4f2107 /qpid/java
parent217f6f6e0bb2083548803198c9490d963a5d5735 (diff)
downloadqpid-python-f84ed512e919a6c717cbdbcc22e8139bc64bc205.tar.gz
QPID-6129: [Java Broker] Chain exceptions in Derby/JDBC store implementations
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1628743 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java2
-rw-r--r--qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java19
2 files changed, 6 insertions, 15 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
index 52072678e8..4fbfdfdd2d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
@@ -572,7 +572,7 @@ public abstract class AbstractJDBCConfigurationStore implements MessageStoreProv
}
catch (SQLException e)
{
- throw new StoreException("Error creating ConfiguredObject " + object);
+ throw new StoreException("Error creating ConfiguredObject " + object, e);
}
}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
index 9633e32408..4dfaa716cf 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
@@ -133,7 +133,7 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
}
catch (SQLException e)
{
- throw new StoreException(e);
+ throw new StoreException("Failed to determine maximum ids", e);
}
}
@@ -816,7 +816,6 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
private void commitTran(ConnectionWrapper connWrapper) throws StoreException
{
-
try
{
Connection conn = connWrapper.getConnection();
@@ -833,10 +832,6 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
{
throw new StoreException("Error commit tx: " + e.getMessage(), e);
}
- finally
- {
-
- }
}
private StoreFuture commitTranAsync(ConnectionWrapper connWrapper) throws StoreException
@@ -1448,7 +1443,7 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
}
catch (SQLException e)
{
- throw new StoreException(e);
+ throw new StoreException("Failed to get metadata for message id: " + _messageId, e);
}
}
@@ -1507,7 +1502,7 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
}
catch (SQLException e)
{
- throw new StoreException(e);
+ throw new StoreException("Failed to get content for message id " + _messageId, e);
}
}
else
@@ -1551,7 +1546,7 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
}
catch (SQLException e)
{
- throw new StoreException(e);
+ throw new StoreException("Failed to get content for message id: " + _messageId, e);
}
}
else
@@ -1598,11 +1593,7 @@ public abstract class AbstractJDBCMessageStore implements MessageStore
}
catch (SQLException e)
{
- throw new StoreException(e);
- }
- finally
- {
-
+ throw new StoreException("Failed to flow to disk", e);
}
return true;
}