Author: dkulp
Date: Wed Sep 14 17:43:39 2011
New Revision: 1170729
URL: http://svn.apache.org/viewvc?rev=1170729&view=rev
Log:
[CXF-3802] Easier override of addressing properties from service
Patch tested by Jesse Pangburn
Modified:
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Modified:
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1170729&r1=1170728&r2=1170729&view=diff
==============================================================================
---
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
(original)
+++
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Wed Sep 14 17:43:39 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) {
