Author: dkulp Date: Wed Dec 5 18:37:36 2012 New Revision: 1417579 URL: http://svn.apache.org/viewvc?rev=1417579&view=rev Log: Merged revisions 1417574 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1417574 | dkulp | 2012-12-05 13:32:03 -0500 (Wed, 05 Dec 2012) | 10 lines Merged revisions 1417515 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1417515 | dkulp | 2012-12-05 11:39:39 -0500 (Wed, 05 Dec 2012) | 2 lines Just copy the non-inbound headers to the response ........ ........ Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java Modified: cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java?rev=1417579&r1=1417578&r2=1417579&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java (original) +++ cxf/branches/2.5.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java Wed Dec 5 18:37:36 2012 @@ -178,12 +178,13 @@ public abstract class AbstractJAXWSMetho Iterator<?> iter = list.iterator(); while (iter.hasNext()) { Header header = (Header) iter.next(); - if (!header.getName().getNamespaceURI(). - equals("http://docs.oasis-open.org/wss/2004/01/"; - + "oasis-200401-wss-wssecurity-secext-1.0.xsd") - && !header.getName().getNamespaceURI(). - equals("http://docs.oasis-open.org/"; - + "wss/oasis-wss-wssecurity-secext-1.1.xsd")) { + if (header.getDirection() != Header.Direction.DIRECTION_IN + && !header.getName().getNamespaceURI(). + equals("http://docs.oasis-open.org/wss/2004/01/"; + + "oasis-200401-wss-wssecurity-secext-1.0.xsd") + && !header.getName().getNamespaceURI(). + equals("http://docs.oasis-open.org/"; + + "wss/oasis-wss-wssecurity-secext-1.1.xsd")) { //don't copy over security header, out interceptor chain will take care of it. sm.getHeaders().add(header); }
