[jboss-cvs] JBoss Messaging SVN: r6185 - in branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482: tests/src/org/jboss/test/messaging/jms/clustering and 1 other directories.

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

Author: jbertram at redhat.com
Date: 2009-03-26 15:48:44 -0400 (Thu, 26 Mar 2009)
New Revision: 6185

Modified:
   branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
   branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
   branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java
Log:
[JBPAPP-1833]

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2009-03-26 19:26:54 UTC (rev 6184)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2009-03-26 19:48:44 UTC (rev 6185)
@@ -449,7 +449,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)
@@ -459,7 +459,7 @@
          return false;
       }
 
-      client.addConnectionListener(listener);
+      client.addConnectionListener(listener, serverLocator.getParameters());
       remotingConnectionListener = listener;
 
       return true;
@@ -467,7 +467,7 @@
 
    public synchronized void addPlainConnectionListener(ConnectionListener listener)
    {
-      client.addConnectionListener(listener);
+      client.addConnectionListener(listener, serverLocator.getParameters());
    }
 
    public synchronized void removePlainConnectionListener(ConnectionListener listener)

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java	2009-03-26 19:26:54 UTC (rev 6184)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java	2009-03-26 19:48:44 UTC (rev 6185)
@@ -226,7 +226,7 @@
          ServerManagement.log(ServerManagement.INFO, "Killing server1", 2);
          ServerManagement.kill(1);
          // Need some time for Lease 
-         Thread.sleep(5000);
+         Thread.sleep(11000);
 
          assertEquals("Delegates are different on topology", 2,clusterDelegate.getTopology().getDelegates().length);
          assertEquals(2, clusterDelegate.getDelegates().length);

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java	2009-03-26 19:26:54 UTC (rev 6184)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP03_JBMESSAGING_1482/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java	2009-03-26 19:48:44 UTC (rev 6185)
@@ -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 ------------------------------------------------------------------------------------