Author: ningjiang Date: Mon Jan 17 09:01:45 2011 New Revision: 1059819 URL: http://svn.apache.org/viewvc?rev=1059819&view=rev Log: Merged revisions 1059815 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk
........ r1059815 | ningjiang | 2011-01-17 16:52:11 +0800 (Mon, 17 Jan 2011) | 1 line CXF-3252 org.apache.cxf.ws.addressing.ContextUtils.getAction should support namespace "http://www.w3.org/2005/08/addressing"; ........ 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 (original) +++ svn:mergeinfo Mon Jan 17 09:01:45 2011 @@ -1 +1 @@ -/cxf/trunk:1059746 +/cxf/trunk:1059746,1059815 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=1059819&r1=1059818&r2=1059819&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 Mon Jan 17 09:01:45 2011 @@ -891,6 +891,9 @@ public final class ContextUtils { Names.WSAW_ACTION_NAME)); } if (o == null) { + o = ext.getExtensionAttributes().get(new QName(JAXWSAConstants.NS_WSA, Names.WSAW_ACTION_NAME)); + } + if (o == null) { o = ext.getExtensionAttributes().get(new QName(Names.WSA_NAMESPACE_WSDL_NAME_OLD, Names.WSAW_ACTION_NAME)); }
