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

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

Author: gaohoward
Date: 2009-01-13 05:53:40 -0500 (Tue, 13 Jan 2009)
New Revision: 5616

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
   branches/Branch_1_4/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java
Log:
JBMESSAGING-1482


Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2009-01-13 03:52:51 UTC (rev 5615)
+++ branches/Branch_1_4/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2009-01-13 10:53:40 UTC (rev 5616)
@@ -489,7 +489,7 @@
    }
 
    /**
-    * @return true if the listener was correctly installed, or false if the add attepmt was ignored
+    * @return true if the listener was correctly installed, or false if the add attempt was ignored
     *         because there is already another listener installed.
     */
    public synchronized boolean addConnectionListener(ConsolidatedRemotingConnectionListener listener)
@@ -499,7 +499,7 @@
          return false;
       }
 
-      client.addConnectionListener(listener);
+      client.addConnectionListener(listener, serverLocator.getParameters());
       remotingConnectionListener = listener;
 
       return true;
@@ -507,7 +507,7 @@
 
    public synchronized void addPlainConnectionListener(ConnectionListener listener)
    {
-      client.addConnectionListener(listener);
+      client.addConnectionListener(listener, serverLocator.getParameters());
    }
 
    public synchronized void removePlainConnectionListener(ConnectionListener listener)

Modified: branches/Branch_1_4/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java	2009-01-13 03:52:51 UTC (rev 5615)
+++ branches/Branch_1_4/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java	2009-01-13 10:53:40 UTC (rev 5616)
@@ -6,6 +6,9 @@
  */
 package org.jboss.test.thirdparty.remoting;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.jboss.logging.Logger;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvokerLocator;
@@ -167,7 +170,46 @@
          }
       }
    }
+   
+   
+   public void testClientConfigurationOverride() throws Throwable
+   {
 
+      if (!"bisocket".equals(ServerManagement.getRemotingTransport(0)))
+      {
+         return;
+      }
+
+      Client client = null;
+
+      try
+      {
+         client = new Client(serverLocator, RemotingTestSubsystemService.SUBSYSTEM_LABEL);
+
+         client.connect();
+
+         SimpleConnectionListener connListener = new SimpleConnectionListener();
+
+         Map<String, String> metadata = new HashMap<String, String>();
+
+         metadata.put("validatorPingPeriod", "13000");
+
+         client.addConnectionListener(connListener, metadata);
+         
+         long pingPerod = client.getPingPeriod();
+         
+         assertEquals(13000, pingPerod);
+
+      }
+      finally
+      {
+         if (client != null)
+         {
+            client.disconnect();
+         }
+      }
+   }
+
    // Package protected ----------------------------------------------------------------------------
 
    // Protected ------------------------------------------------------------------------------------