activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject activemq git commit: check for null in case where deleteAllMessages is called w/o broker ref, prevelant in tests resulting in bogus errors
Date Wed, 29 Apr 2015 11:09:34 GMT
Repository: activemq
Updated Branches:
  refs/heads/master eea3230c3 -> 977deb42c


check for null in case where deleteAllMessages is called w/o broker ref, prevelant in tests
resulting in bogus errors


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/977deb42
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/977deb42
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/977deb42

Branch: refs/heads/master
Commit: 977deb42c8cb9a8bc4802a016c0ca920b72a630a
Parents: eea3230
Author: gtully <gary.tully@gmail.com>
Authored: Wed Apr 29 11:02:43 2015 +0100
Committer: gtully <gary.tully@gmail.com>
Committed: Wed Apr 29 11:54:28 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/activemq/store/jdbc/TransactionContext.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/977deb42/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java
----------------------------------------------------------------------
diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java
b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java
index 5e5d556..25b78ab 100755
--- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java
+++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java
@@ -69,7 +69,9 @@ public class TransactionContext {
                 inTx = false;
                 close();
                 IOException ioe = IOExceptionSupport.create(e);
-                persistenceAdapter.getBrokerService().handleIOException(ioe);
+                if (persistenceAdapter.getBrokerService() != null) {
+                    persistenceAdapter.getBrokerService().handleIOException(ioe);
+                }
                 throw ioe;
             }
 


Mime
View raw message