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

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

Author: ovidiu.feodorov at jboss.com
Date: 2007-02-26 20:14:28 -0500 (Mon, 26 Feb 2007)
New Revision: 2454

Modified:
   trunk/build-thirdparty.xml
   trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
Log:
integrated Remoting 2.2.0.Beta1

Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml	2007-02-27 00:59:48 UTC (rev 2453)
+++ trunk/build-thirdparty.xml	2007-02-27 01:14:28 UTC (rev 2454)
@@ -92,15 +92,22 @@
       <componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
       <componentref name="jboss/aop" version="1.5.3.GA"/>
       <componentref name="jboss/serialization" version="1.0.3.GA"/>
-      <componentref name="jboss/remoting" version="2.2.0.Alpha7"/>
+      <componentref name="jboss/remoting" version="2.2.0.Beta1"/>
       <componentref name="jboss/jbossts" version="4.2.2.GA"/>
       <componentref name="jboss/test14" version="1.0.0.GA"/>
       <componentref name="jboss/jbossretro-rt" version="1.0.4.GA"/>
       <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
 
+      <!--
+          Totally unapropriate here, but this is what we need to do for the time being if we
+          want HTTP.
+          See http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4022727 for more details.
+      -->
       <componentref name="apache-tomcat" version="5.5.15"/>
 
-      <!-- Need this otherwise project doesn't build in Eclipse -->
+      <!--
+          Need this otherwise project doesn't build in Eclipse. TODO Really?
+      -->
       <componentref name="apache-logging" version="1.0.4.1jboss"/>
 
       <!--

Modified: trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-02-27 00:59:48 UTC (rev 2453)
+++ trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-02-27 01:14:28 UTC (rev 2454)
@@ -331,9 +331,11 @@
       // thus silencing both the connection validator and the lease pinger, and also locally
       // cleaning up the callback listener
 
+      client.setDisconnectTimeout(0);
+
       try
       {
-         client.removeListenerLocal(callbackManager);
+         client.removeListener(callbackManager);
       }
       catch(Throwable t)
       {
@@ -342,8 +344,7 @@
          log.debug(this + " failed to cleanly remove callback manager from the client", t);
       }
 
-      client.disconnectLocal();
-
+      client.disconnect();
    }
 
    /**