Author: dkulp Date: Wed Sep 14 17:54:40 2011 New Revision: 1170739 URL: http://svn.apache.org/viewvc?rev=1170739&view=rev Log: Merged revisions 1170734 via svnmerge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1170734 | dkulp | 2011-09-14 13:49:46 -0400 (Wed, 14 Sep 2011) | 10 lines Merged revisions 1170729 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1170729 | dkulp | 2011-09-14 13:43:39 -0400 (Wed, 14 Sep 2011) | 2 lines [CXF-3802] Easier override of addressing properties from service Patch tested by Jesse Pangburn ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Propchange: cxf/branches/2.3.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1170739&r1=1170738&r2=1170739&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original) +++ cxf/branches/2.3.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Wed Sep 14 17:54:40 2011 @@ -272,8 +272,14 @@ public final class ContextUtils { LOG.log(Level.FINE, "retrieving MAPs from context property {0}", mapProperty); + AddressingPropertiesImpl maps = (AddressingPropertiesImpl)message.get(mapProperty); + if (maps == null && isOutbound && !isRequestor + && message.getExchange() != null && message.getExchange().getInMessage() != null) { + maps = (AddressingPropertiesImpl)message.getExchange().getInMessage().get(mapProperty); + } + if (maps != null) { LOG.log(Level.FINE, "current MAPs {0}", maps); } else if (!isProviderContext) {
