Author: ron.sigal(a)jboss.com Date: 2009-08-12 20:36:07 -0400 (Wed, 12 Aug 2009) New Revision: 5327 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java Log: JBREM-1143: Value of "invokerDestructionDelay" can come from InvokerLocator as well as configuration map. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java 2009-08-12 02:31:22 UTC (rev 5326) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/Client.java 2009-08-13 00:36:07 UTC (rev 5327) @@ -294,27 +294,9 @@ if (configuration != null) { this.configuration = new HashMap(configuration); - Object o = configuration.get(INVOKER_DESTRUCTION_DELAY); + Object o = configuration.get(Remoting.USE_CLIENT_CONNECTION_IDENTITY); if (o instanceof String) { - try - { - invokerDestructionDelay = Integer.parseInt((String) o); - log.debug(this + " setting invokerDestructionDelay to " + invokerDestructionDelay); - } - catch (NumberFormatException e) - { - log.error("invokerDestructionDelay parameter has invalid format: " + o); - } - } - else if (o != null) - { - log.error("invokerDestructionDelay parameter must be a string in integer format: " + o); - } - - o = configuration.get(Remoting.USE_CLIENT_CONNECTION_IDENTITY); - if (o instanceof String) - { useClientConnectionIdentity = Boolean.valueOf((String) o).booleanValue(); } else if (o != null) @@ -343,6 +325,24 @@ tempMap.putAll(locator.getParameters()); PortUtil.updateRange(tempMap); + Object o = tempMap.get(INVOKER_DESTRUCTION_DELAY); + if (o instanceof String) + { + try + { + invokerDestructionDelay = Integer.parseInt((String) o); + log.debug(this + " setting invokerDestructionDelay to " + invokerDestructionDelay); + } + catch (NumberFormatException e) + { + log.error("invokerDestructionDelay parameter has invalid format: " + o); + } + } + else if (o != null) + { + log.error("invokerDestructionDelay parameter must be a string in integer format: " + o); + } + this.sessionId = new GUID().toString(); }