Author: dkulp
Date: Wed Sep 14 17:49:46 2011
New Revision: 1170734
URL: http://svn.apache.org/viewvc?rev=1170734&view=rev
Log:
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.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1170734&r1=1170733&r2=1170734&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Wed Sep 14 17:49:46 2011
@@ -277,8 +277,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) {
