[jboss-cvs] JBoss Messaging SVN: r7644 - in branches/Branch_1_4/src/main/org/jboss/jms/client: remoting and 1 other directory.

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

Author: gaohoward
Date: 2009-07-30 05:54:57 -0400 (Thu, 30 Jul 2009)
New Revision: 7644

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java
   branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/ConnectionFactoryCallbackHandler.java
Log:
https://jira.jboss.org/jira/browse/JBMESSAGING-1561


Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java	2009-07-30 09:43:55 UTC (rev 7643)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java	2009-07-30 09:54:57 UTC (rev 7644)
@@ -81,17 +81,17 @@
         throws java.io.IOException, ClassNotFoundException
    {
       s.defaultReadObject();
-      establishCallback();
+      establishCallback(false);
    }
 
-   public synchronized void establishCallback()
+   public synchronized void establishCallback(boolean isConnFailure)
    {
       log.debug(" Establishing CFCallback\n");
 
       for (int server = delegates.length - 1; server >= 0; server--)
       {
          if (trace) log.trace("Closing current callback");
-         closeCallback();
+         closeCallback(isConnFailure);
 
          if (trace) log.trace("Trying communication on server(" + server + ")=" + delegates[server].getServerLocatorURI());
          try
@@ -156,11 +156,11 @@
    protected void finalize() throws Throwable
    {
       super.finalize();
-      closeCallback();
+      closeCallback(false);
 
    }
 
-   public void closeCallback()
+   public void closeCallback(boolean isConnFailure)
    {
       if (remoting != null)
       {
@@ -176,7 +176,14 @@
          try
          {
             remoting.removeConnectionListener();
-            remoting.setFailed();
+            if (isConnFailure)
+            {
+               remoting.setFailed();
+            }
+            else
+            {
+               remoting.stop();
+            }
             currentDelegate = null;
          }
          catch (Throwable ignored)

Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/ConnectionFactoryCallbackHandler.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/ConnectionFactoryCallbackHandler.java	2009-07-30 09:43:55 UTC (rev 7643)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/ConnectionFactoryCallbackHandler.java	2009-07-30 09:54:57 UTC (rev 7644)
@@ -102,7 +102,7 @@
 
          if (delegate!=null)
          {
-            delegate.establishCallback();
+            delegate.establishCallback(true);
          }
 
          //remotingConnection.removePlainConnectionListener(this);