[jboss-remoting-commits] JBoss Remoting SVN: r4925 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection.

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

Author: ron.sigal at jboss.com
Date: 2009-04-04 23:55:07 -0400 (Sat, 04 Apr 2009)
New Revision: 4925

Modified:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
Log:
JBREM-1112: Fixed InvokerLocator in a couple of places to accommodate metadata.

Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java	2009-04-04 21:40:11 UTC (rev 4924)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java	2009-04-05 03:55:07 UTC (rev 4925)
@@ -225,8 +225,9 @@
       
       // Create client.
       String clientLocatorURI = locatorURI;
-      clientLocatorURI += "/?" + Client.USE_ALL_PARAMS + "=true";
+      clientLocatorURI += "&" + Client.USE_ALL_PARAMS + "=true";
       clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=0";
+      log.info("clientLocatorURI: " + clientLocatorURI);
       InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
       HashMap clientConfig = new HashMap();
       clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
@@ -268,8 +269,9 @@
       
       // Create client.
       String clientLocatorURI = locatorURI;
-      clientLocatorURI += "/?" + Client.USE_ALL_PARAMS + "=true";
+      clientLocatorURI += "&" + Client.USE_ALL_PARAMS + "=true";
       clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=10000";
+      log.info("clientLocatorURI: " + clientLocatorURI);
       InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
       HashMap clientConfig = new HashMap();
       clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
@@ -478,11 +480,11 @@
       InvokerRegistry.registerInvokerFactories("socket", org.jboss.remoting.transport.socket.TransportClientFactory.class, TestServerInvokerFactory.class);
       host = InetAddress.getLocalHost().getHostAddress();
       port = PortUtil.findFreePort(host);
-      locatorURI = getTransport() + "://" + host + ":" + port;
+      locatorURI = getTransport() + "://" + host + ":" + port + "/?x=x";
       String metadata = System.getProperty("remoting.metadata");
       if (metadata != null)
       {
-         locatorURI += "/?" + metadata;
+         locatorURI += "&" + metadata;
       }
       serverLocator = new InvokerLocator(locatorURI);
       log.info("Starting remoting server with locator uri of: " + locatorURI);