activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject git commit: Fixes NPE that was occurring.
Date Fri, 27 Sep 2013 08:51:32 GMT
Updated Branches:
  refs/heads/trunk 21fe8cac7 -> 70c698f98


Fixes NPE that was occurring.

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

Branch: refs/heads/trunk
Commit: 70c698f9889d84fd574f324e791c41d8ac75c85a
Parents: 21fe8ca
Author: Hiram Chirino <hiram@hiramchirino.com>
Authored: Fri Sep 27 04:51:11 2013 -0400
Committer: Hiram Chirino <hiram@hiramchirino.com>
Committed: Fri Sep 27 04:51:11 2013 -0400

----------------------------------------------------------------------
 .../activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/70c698f9/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
index 4d00c5b..6cc252f 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MultiKahaDBPersistenceAdapter.java
@@ -43,7 +43,7 @@ import java.util.*;
  *
  * @org.apache.xbean.XBean element="mKahaDB"
  */
-public class MultiKahaDBPersistenceAdapter extends LockableServiceSupport implements PersistenceAdapter
{
+public class MultiKahaDBPersistenceAdapter extends LockableServiceSupport implements PersistenceAdapter,
BrokerServiceAware {
     static final Logger LOG = LoggerFactory.getLogger(MultiKahaDBPersistenceAdapter.class);
 
     final static ActiveMQDestination matchAll = new AnyDestination(new ActiveMQDestination[]{new
ActiveMQQueue(">"), new ActiveMQTopic(">")});
@@ -438,12 +438,12 @@ public class MultiKahaDBPersistenceAdapter extends LockableServiceSupport
implem
 
     @Override
     public void setBrokerService(BrokerService brokerService) {
+        this.brokerService = brokerService;
         for (PersistenceAdapter persistenceAdapter : adapters) {
             if( persistenceAdapter instanceof BrokerServiceAware ) {
                 ((BrokerServiceAware)persistenceAdapter).setBrokerService(getBrokerService());
             }
         }
-        this.brokerService = brokerService;
     }
 
     public BrokerService getBrokerService() {


Mime
View raw message