[jboss-cvs] JBoss Messaging SVN: r3407 - in branches/Branch_Stable: tests/src/org/jboss/test/thirdparty/remoting and 1 other directory.

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

Author: timfox
Date: 2007-12-04 06:18:26 -0500 (Tue, 04 Dec 2007)
New Revision: 3407

Modified:
   branches/Branch_Stable/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
   branches/Branch_Stable/tests/src/org/jboss/test/thirdparty/remoting/ServerAddressTest.java
Log:
More fiddles to play nice with remoting


Modified: branches/Branch_Stable/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- branches/Branch_Stable/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-12-04 09:47:22 UTC (rev 3406)
+++ branches/Branch_Stable/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-12-04 11:18:26 UTC (rev 3407)
@@ -278,31 +278,15 @@
 
       client.setSubsystem(ServerPeer.REMOTING_JMS_SUBSYSTEM);
       
-      config.putAll(serverLocator.getParameters());
-      config.put(Client.ENABLE_LEASE, "false");
-      config.put(MicroSocketClientInvoker.MAX_POOL_SIZE_FLAG, "1");
+      Map config2 = new HashMap();
       
-      //Hack - need to change the timeout to make sure a different pool is used
-      config.put("timeout", String.valueOf(Integer.MAX_VALUE));
+      //config.putAll(serverLocator.getParameters());
+      config2.put(Client.ENABLE_LEASE, "false");
+      config2.put(MicroSocketClientInvoker.MAX_POOL_SIZE_FLAG, "1");
       
-      StringBuffer buff = new StringBuffer();
-      buff.append(serverLocator.getProtocol()).append("://");
-      buff.append(serverLocator.getHost()).append(":").append(serverLocator.getPort());
-      buff.append("/?");      
-      Iterator iter = config.entrySet().iterator();
-      while (iter.hasNext())
-      {
-         Map.Entry entry = (Map.Entry)iter.next();
-         String key = (String)entry.getKey();
-         String val = (String)entry.getValue();
-         buff.append(key).append("=").append(val);
-         if (iter.hasNext())
-         {
-            buff.append("&");
-         }
-      }
- 
-      onewayClient = new Client(new InvokerLocator(buff.toString()), config);
+      //Note we *must* use same serverLocator or invm optimisation won't work even if one param on the URI
+      //is different
+      onewayClient = new Client(serverLocator, config2);
       
       onewayClient.setSubsystem(ServerPeer.REMOTING_JMS_SUBSYSTEM);
                        

Modified: branches/Branch_Stable/tests/src/org/jboss/test/thirdparty/remoting/ServerAddressTest.java
===================================================================
--- branches/Branch_Stable/tests/src/org/jboss/test/thirdparty/remoting/ServerAddressTest.java	2007-12-04 09:47:22 UTC (rev 3406)
+++ branches/Branch_Stable/tests/src/org/jboss/test/thirdparty/remoting/ServerAddressTest.java	2007-12-04 11:18:26 UTC (rev 3407)
@@ -37,8 +37,8 @@
 
    public void testEquals() throws Throwable
    {
-      ServerAddress sa = new ServerAddress("127.0.0.1", 5678, false, 0);
-      ServerAddress sa2 = new ServerAddress("127.0.0.1", 5678, false, 1);
+      ServerAddress sa = new ServerAddress("127.0.0.1", 5678, false, 0, 50);
+      ServerAddress sa2 = new ServerAddress("127.0.0.1", 5678, false, 1, 50);
 
       assertFalse(sa.equals(sa2));
    }