[rhmessaging-commits] rhmessaging commits: r4357 - store/branches/java/0.5.x-dev/src/main/java/org/apache/qpid/server/store/berkeleydb.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Tue Sep 28 10:58:40 EDT 2010
Author: rgemmell
Date: 2010-09-28 10:58:40 -0400 (Tue, 28 Sep 2010)
New Revision: 4357
Modified:
store/branches/java/0.5.x-dev/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
Log:
Stop incorrectly advising people to upgrade store versions when an exception is thrown during recovery, group catch blocks into a common Exception catch block
Modified: store/branches/java/0.5.x-dev/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
--- store/branches/java/0.5.x-dev/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2010-09-28 14:57:46 UTC (rev 4356)
+++ store/branches/java/0.5.x-dev/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2010-09-28 14:58:40 UTC (rev 4357)
@@ -1283,23 +1283,11 @@
commitTran(context);
}
- catch (DatabaseException e)
+ catch (Exception e)
{
abortTran(context);
-
throw new AMQException("Error recovering persistent state: " + e, e);
}
- catch (AMQException amqe)
- {
- abortTran(context);
- throw new AMQException("Error recovering persistent state: " + amqe, amqe);
- }
- catch (Throwable ioobe)
- {
- abortTran(context);
- throw new AMQException("Invalid database format. Please use upgrade tool for store in Virtualhost:'"
- + _virtualHost.getName() + "'", ioobe);
- }
stateTransition(State.RECOVERING, State.STARTED);
}
More information about the rhmessaging-commits
mailing list