[jboss-cvs] JBoss Messaging SVN: r4113 - branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/bridge.

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

Author: clebert.suconic at jboss.com
Date: 2008-04-24 11:39:11 -0400 (Thu, 24 Apr 2008)
New Revision: 4113

Modified:
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/bridge/Bridge.java
Log:
Reverting fix since this was a remoting bug

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/bridge/Bridge.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/bridge/Bridge.java	2008-04-24 15:37:10 UTC (rev 4112)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/src/main/org/jboss/jms/server/bridge/Bridge.java	2008-04-24 15:39:11 UTC (rev 4113)
@@ -1081,36 +1081,29 @@
    
    private void cleanup()
    {
-	   // Using just a plain thread to close this, as this failure shouldn't be happening very oftenly
-	  class ThreadCloser extends Thread
-	  {
-		  Connection connections[];
-		  ThreadCloser(Connection ... connections)
-		  {
-			  this.connections = connections;
-		  }
-		  
-		  public void run()
-		  {
-			  for (int i=0; i< connections.length; i++)
-			  {
-	           log.debug("Closing connection " + (i==0?"(source)":"(target)") );
-				  try
-				  {
-					  connections[i].close();
-				  }
-				  catch (Exception ignored)
-				  {
-					  log.trace("Error closing " + (i==0?"source":"target")  + " connection:", ignored);
-				  }
-			  }
-		  }
-	  }
-	  new ThreadCloser(sourceConn, targetConn).start();
-	  
-	  sourceConn = null;
-	  targetConn = null;
    	
+      //Close the old objects
+      try
+      {
+         sourceConn.close();
+      }
+      catch (Throwable ignore)
+      {            
+      	if (trace) { log.trace("Failed to close source connection", ignore); }
+      }
+      try
+      {
+         if (targetConn != null)
+         {
+            targetConn.close();
+         }
+      }
+      catch (Throwable ignore)
+      {    
+      	if (trace) { log.trace("Failed to close target connection", ignore); }
+      }
+
+   	
       if (tx != null)
       {
          try