svn commit: r661402 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java

[ch...@apache.org]

Author: chirino
Date: Thu May 29 10:01:55 2008
New Revision: 661402

URL: http://svn.apache.org/viewvc?rev=661402&view=rev
Log:
Fixed PublishOnTopicConsumerMessageUsingActivemqXMLTest case that started failing due to the recently added chagne to the journal persistence adapter which did a:
 this.usageManager.getMemoryUsage().addUsageListener(this); on start.  Basically we now don't start the persistence layer until the broker is started (was happening
when the broker was created).


Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=661402&r1=661401&r2=661402&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Thu May 29 10:01:55 2008
@@ -447,18 +447,23 @@
 
             BrokerRegistry.getInstance().bind(getBrokerName(), this);
 
-            startDestinations();
-
-            addShutdownHook();
+            
             LOG.info("Using Persistence Adapter: " + getPersistenceAdapter());
+            getPersistenceAdapter().setUsageManager(getProducerSystemUsage());
+            getPersistenceAdapter().setBrokerName(getBrokerName());
             if (deleteAllMessagesOnStartup) {
                 deleteAllMessages();
             }
+            getPersistenceAdapter().start();
+
+            startDestinations();
+
+            addShutdownHook();
 
             if (isUseJmx()) {
                 getManagementContext().start();
             }
-
+            
             getBroker().start();
 
            // see if there is a MasterBroker service and if so, configure
@@ -1596,12 +1601,10 @@
     protected Broker createRegionBroker() throws Exception {
         // we must start the persistence adaptor before we can create the region
         // broker
-        getPersistenceAdapter().setUsageManager(getProducerSystemUsage());
-        getPersistenceAdapter().setBrokerName(getBrokerName());
         if (this.deleteAllMessagesOnStartup) {
             getPersistenceAdapter().deleteAllMessages();
         }
-        getPersistenceAdapter().start();
+//        getPersistenceAdapter().start();
 
         if (destinationInterceptors == null) {
             destinationInterceptors = createDefaultDestinationInterceptor();