[jboss-remoting-commits] JBoss Remoting SVN: r4881 - remoting2/branches/2.x/src/main/org/jboss/remoting.

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

Author: ron.sigal at jboss.com
Date: 2009-03-20 02:36:01 -0400 (Fri, 20 Mar 2009)
New Revision: 4881

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java
Log:
JBREM-1082: (1) Added USE_ALL_PARAMS; (2) corrected unary addConnectionListener().

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java	2009-03-20 06:34:57 UTC (rev 4880)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/Client.java	2009-03-20 06:36:01 UTC (rev 4881)
@@ -164,6 +164,11 @@
    
    public static final String THROW_CALLBACK_EXCEPTION = "throwCallbackException";
 
+   /** The key to use to specify that parameters for objects created by Client should be taken,
+    *  in addition to the metadata map, from the InvokerLocator and from the Client's configuration map.
+    */
+   public static final String USE_ALL_PARAMS = "useAllParams";
+   
    private static final Logger log = Logger.getLogger(Client.class);
 
    private static final long serialVersionUID = 5679279425009837934L;
@@ -377,7 +382,8 @@
    public void addConnectionListener(ConnectionListener listener)
    {
       HashMap metadata = new HashMap();
-      if (configuration.get(ConnectionValidator.VALIDATOR_PING_PERIOD) == null)
+      if (configuration.get(ConnectionValidator.VALIDATOR_PING_PERIOD) == null && 
+          locator.getParameters().get(ConnectionValidator.VALIDATOR_PING_PERIOD) == null)
       {
          String pingPeriod = Long.toString(ConnectionValidator.DEFAULT_PING_PERIOD);
          metadata.put(ConnectionValidator.VALIDATOR_PING_PERIOD, pingPeriod);