You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/01/17 10:13:05 UTC
svn commit: r1059821 - in /cxf/branches/2.2.x-fixes: ./
rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Author: ningjiang
Date: Mon Jan 17 09:13:05 2011
New Revision: 1059821
URL: http://svn.apache.org/viewvc?rev=1059821&view=rev
Log:
Merged revisions 1059819 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................
r1059819 | ningjiang | 2011-01-17 17:01:45 +0800 (Mon, 17 Jan 2011) | 9 lines
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.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 17 09:13:05 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817
-/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792
+/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819
+/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1059821&r1=1059820&r2=1059821&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original)
+++ cxf/branches/2.2.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Mon Jan 17 09:13:05 2011
@@ -836,6 +836,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));
}