Author: alessio.soldano(a)jboss.com Date: 2009-09-16 13:07:29 -0400 (Wed, 16 Sep 2009) New Revision: 10699 Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java Log: [JBWS-2763] Prevent useless multiple invocations Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-09-16 17:05:29 UTC (rev 10698) +++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2009-09-16 17:07:29 UTC (rev 10699) @@ -262,8 +262,9 @@ CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); msgContext.setOperationMetaData(opMetaData); + Map<String, Object> requestCtx = getRequestContext(); // Copy properties to the message context - msgContext.putAll(getRequestContext()); + msgContext.putAll(requestCtx); // The direction of the message DirectionHolder direction = new DirectionHolder(Direction.OutBound); @@ -333,7 +334,7 @@ if (targetAddress == null) throw new WSException("Target endpoint address not set"); - Map<String, Object> callProps = new HashMap<String, Object>(getRequestContext()); + Map<String, Object> callProps = new HashMap<String, Object>(requestCtx); EndpointInfo epInfo = new EndpointInfo(epMetaData, targetAddress, callProps); boolean maintainSession = shouldMaintainSession(); if (maintainSession) @@ -342,8 +343,8 @@ RemoteConnection remoteConnection = new RemoteConnectionFactory().getRemoteConnection(epInfo); MessageAbstraction resMessage = remoteConnection.invoke(reqMessage, epInfo, oneway); - if (shouldMaintainSession()) - saveSessionInfo(callProps, getRequestContext()); + if (maintainSession) + saveSessionInfo(callProps, requestCtx); // At pivot the message context might be replaced msgContext = processPivotInternal(msgContext, direction);