Author: mwringe Date: 2012-03-26 15:40:13 -0400 (Mon, 26 Mar 2012) New Revision: 8639 Modified: components/wsrp/branches/2.1.x/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java Log: BZ-803544: We need to add the ws-security handler before the RequestHeaderClientHandler so that the cookies with the session gets added. Otherwise we create a new session when accessing the producer with wss. Modified: components/wsrp/branches/2.1.x/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java =================================================================== --- components/wsrp/branches/2.1.x/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2012-03-23 14:52:52 UTC (rev 8638) +++ components/wsrp/branches/2.1.x/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2012-03-26 19:40:13 UTC (rev 8639) @@ -132,21 +132,24 @@ List<Handler> handlerChain = binding.getHandlerChain(); if (handlerChain != null) { + //We need to make sure the WSS handlers are added before the REQUEST_HEADER_CLIENT_HANDLER otherwise the session information is lost + addWSSHandlers(handlerChain); + // if we already have a handler chain, just add the request hearder handler if it's not already in there if (!handlerChain.contains(REQUEST_HEADER_CLIENT_HANDLER)) { handlerChain.add(REQUEST_HEADER_CLIENT_HANDLER); } - - addWSSHandlers(handlerChain); } else { // otherwise, create a handler chain and add our handler to it handlerChain = new ArrayList<Handler>(1); + + //We need to make sure the WSS handlers are added before the REQUEST_HEADER_CLIENT_HANDLER otherwise the session information is lost + addWSSHandlers(handlerChain); + handlerChain.add(REQUEST_HEADER_CLIENT_HANDLER); - - addWSSHandlers(handlerChain); } binding.setHandlerChain(handlerChain);