[jboss-cvs] JBoss Messaging SVN: r3167 - in trunk/src/main/org/jboss: messaging/core/impl/postoffice and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2007-10-02 18:11:22 -0400 (Tue, 02 Oct 2007)
New Revision: 3167

Modified:
   trunk/src/main/org/jboss/jms/server/ServerPeer.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-1095 - server peer restart problems on the integration

Modified: trunk/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ServerPeer.java	2007-10-02 10:12:11 UTC (rev 3166)
+++ trunk/src/main/org/jboss/jms/server/ServerPeer.java	2007-10-02 22:11:22 UTC (rev 3167)
@@ -346,13 +346,14 @@
          messageStore.stop();
          messageStore = null;
          securityStore.stop();
-         securityStore = null;
+         //securityStore = null; - if securitySTore is set to null, The ServerPeer won't survive a restart of the service (stop/start)
          txRepository.stop();
          txRepository = null;
          messageCounterManager.stop();
          messageCounterManager = null;
          clusterConnectionManager.stop();
          clusterConnectionManager = null;
+         postOffice = null;
          
          unloadServerAOPConfig();
 

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-10-02 10:12:11 UTC (rev 3166)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-10-02 22:11:22 UTC (rev 3167)
@@ -317,7 +317,7 @@
    		return;
    	}
    	
-      if (trace) { log.trace(this + " starting"); }
+      log.debug(this + " starting");
       
       super.start();