Author: dkulp
Date: Fri Apr 10 20:51:44 2009
New Revision: 764047
URL: http://svn.apache.org/viewvc?rev=764047&view=rev
Log:
Merged revisions 763272 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r763272 | eglynn | 2009-04-08 11:10:10 -0400 (Wed, 08 Apr 2009) | 2 lines
Commited patch for CXF-2161 on behalf of Andrew Dinn. Added unit test
coverage also.
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 10 20:51:44 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?rev=764047&r1=764046&r2=764047&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
Fri Apr 10 20:51:44 2009
@@ -462,6 +462,12 @@
AttributedURIType.class,
headerElement,
unmarshaller));
+ } else if (Names.WSA_FROM_NAME.equals(localName)) {
+ maps.setFrom(decodeAsNative(
+ headerURI,
+ EndpointReferenceType.class,
+ headerElement,
+ unmarshaller));
} else if (Names.WSA_TO_NAME.equals(localName)) {
AttributedURIType addr = decodeAsNative(
headerURI,
