[jboss-cvs] JBoss Messaging SVN: r6394 - in trunk/src/main/org/jboss/messaging/core: remoting/impl/invm and 1 other directories.

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

Author: timfox
Date: 2009-04-10 05:19:07 -0400 (Fri, 10 Apr 2009)
New Revision: 6394

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnector.java
   trunk/src/main/org/jboss/messaging/core/server/Messaging.java
Log:
some fixes

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java	2009-04-10 08:58:25 UTC (rev 6393)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java	2009-04-10 09:19:07 UTC (rev 6394)
@@ -580,14 +580,7 @@
 
                backupTransportParams = null;
                
-               log.info("************ ATTEMPTING FAILOVER");
-
                done = reattachSessions(reconnectAttempts == -1 ? -1 : reconnectAttempts + 1);
-               
-               if (done)
-               {
-                  log.info("************* FAILED OVER OK");
-               }
             }
             else if (reconnectAttempts != 0)
             {              
@@ -772,12 +765,12 @@
 
          Set<ConnectionEntry> copy = new HashSet<ConnectionEntry>(connections.values());
 
-         connections.clear();
+         connections.clear();                 
 
          for (ConnectionEntry entry : copy)
          {
             try
-            {
+            {               
                entry.connection.destroy();
             }
             catch (Throwable ignore)
@@ -915,7 +908,7 @@
       {
          refCount--;
       }
-
+      
       if (entry != null)
       {
          checkCloseConnections();

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnector.java	2009-04-10 08:58:25 UTC (rev 6393)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMConnector.java	2009-04-10 09:19:07 UTC (rev 6394)
@@ -111,8 +111,6 @@
          listener.connectionDestroyed(connection.getID());
       }
 
-      connections.clear();
-
       started = false;
    }
 
@@ -183,14 +181,14 @@
       public void connectionDestroyed(final Object connectionID)
       {         
          if (connections.remove(connectionID) != null)
-         {
+         {            
             //Execute on different thread to avoid deadlocks
             new Thread()
             {
                public void run()
                {
                   listener.connectionDestroyed(connectionID);
-                  
+
                   // Close the corresponding connection on the other side
                   acceptor.disconnect((String)connectionID);
                }

Modified: trunk/src/main/org/jboss/messaging/core/server/Messaging.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/Messaging.java	2009-04-10 08:58:25 UTC (rev 6393)
+++ trunk/src/main/org/jboss/messaging/core/server/Messaging.java	2009-04-10 09:19:07 UTC (rev 6394)
@@ -68,7 +68,7 @@
    {
       JBMSecurityManager securityManager = new JBMSecurityManagerImpl();
 
-      MessagingServer server = newMessagingServer(config, mbeanServer, securityManager, true);
+      MessagingServer server = newMessagingServer(config, mbeanServer, securityManager, enablePersistence);
 
       return server;
    }