[jboss-cvs] JBoss Messaging SVN: r2087 - in branches/Branch_1_0/src/main/org/jboss/jms/server: connectionmanager and 1 other directory.

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

Author: juha at jboss.org
Date: 2007-01-29 05:11:25 -0500 (Mon, 29 Jan 2007)
New Revision: 2087

Modified:
   branches/Branch_1_0/src/main/org/jboss/jms/server/ConnectionManager.java
   branches/Branch_1_0/src/main/org/jboss/jms/server/ServerPeer.java
   branches/Branch_1_0/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
Log:
rollback 605

Modified: branches/Branch_1_0/src/main/org/jboss/jms/server/ConnectionManager.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/server/ConnectionManager.java	2007-01-29 00:36:22 UTC (rev 2086)
+++ branches/Branch_1_0/src/main/org/jboss/jms/server/ConnectionManager.java	2007-01-29 10:11:25 UTC (rev 2087)
@@ -27,8 +27,7 @@
 /**
  * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
- * 
+ *
  * @version <tt>$Revision$</tt>
  *
  * $Id$
@@ -46,5 +45,4 @@
    
    boolean containsSession(String remotingClientSessionID);
 
-   void closeAllConnections();
 }

Modified: branches/Branch_1_0/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/server/ServerPeer.java	2007-01-29 00:36:22 UTC (rev 2086)
+++ branches/Branch_1_0/src/main/org/jboss/jms/server/ServerPeer.java	2007-01-29 10:11:25 UTC (rev 2087)
@@ -223,8 +223,6 @@
          messageIdManager = new IdManager("MESSAGE_ID", 8192, persistenceManagerDelegate);
    
          initializeRemoting(mbeanServer);
-   
-         addShutdownHook();
 
          started = true;
    
@@ -633,34 +631,6 @@
 
    // Private -------------------------------------------------------
 
-   /**
-    * JBMESSAGING-605 [JPL]
-    */
-   private void addShutdownHook()
-   {
-      try
-      {
-         // NOTE: Not invoking as a privileged operation since it's not critical for running messaging.
-         //       Handling the potential security exception below [JPL]
-
-         Runtime.getRuntime().addShutdownHook(
-               new Thread(
-                     new Runnable()
-                     {
-                        public void run()
-                        {
-                           connectionManager.closeAllConnections();
-                        }
-                     }
-               )
-         );
-      }
-      catch (SecurityException e)
-      {
-         log.warn("Unable to register shutdown hook for closing unhandled connections.", e);
-      }
-   }
-
    private void initializeRemoting(MBeanServer mbeanServer) throws Exception
    {
       // We explicitly associate the datatype "jms" with the java SerializationManager

Modified: branches/Branch_1_0/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
===================================================================
--- branches/Branch_1_0/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java	2007-01-29 00:36:22 UTC (rev 2086)
+++ branches/Branch_1_0/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java	2007-01-29 10:11:25 UTC (rev 2087)
@@ -92,57 +92,7 @@
                 Util.guidToString(remotingClientSessionID));
    }
 
-   public synchronized void closeAllConnections()
-   {
-      if (jmsClients == null)
-         return;
 
-      Iterator jmsClientVMIds = jmsClients.keySet().iterator();
-
-      if (trace)
-      {
-         log.trace("Found " + jmsClients.size() + " jms clients.");
-      }
-
-      while (jmsClientVMIds.hasNext())
-      {
-         String jmsClientVMId = (String)jmsClientVMIds.next();
-         Map endpoints = (Map)jmsClients.get(jmsClientVMId);
-
-         if (endpoints != null)
-         {
-            Iterator it = endpoints.values().iterator();
-
-            while (it.hasNext())
-            {
-               ConnectionEndpoint e = (ConnectionEndpoint)it.next();
-
-               if (!e.isClosed())
-               {
-                  try
-                  {
-                     log.warn("Closing endpoint " + e);
-
-                     e.closing();
-                     e.close();
-                  }
-                  catch (Throwable t)
-                  {
-                     log.warn("Failed to close endpoint " + e);
-                  }
-               }
-            }
-
-            endpoints.clear();
-         }
-      }
-
-      if (sessions != null)
-         sessions.clear();
-      
-      jmsClients.clear();
-   }
-
    public synchronized ConnectionEndpoint unregisterConnection(String jmsClientVMId, String remotingClientSessionID)
    {
       Map endpoints = (Map)jmsClients.get(jmsClientVMId);