Author: sergeyb
Date: Wed Sep 8 14:52:47 2010
New Revision: 995074
URL: http://svn.apache.org/viewvc?rev=995074&view=rev
Log:
Merged revisions 995041 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r995041 | sergeyb | 2010-09-08 14:09:42 +0100 (Wed, 08 Sep 2010) | 1 line
[CXF-2981] : retaining original generic ReplyTo EPRs if no alternative EPRs
are available
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:995041
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/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java?rev=995074&r1=995073&r2=995074&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
Wed Sep 8 14:52:47 2010
@@ -348,6 +348,32 @@ public class MAPAggregatorTest extends A
// expected
}
}
+
+ @Test
+ public void testReplyToWithAnonymousAddressRetained() throws Exception {
+ Message message = new MessageImpl();
+ Exchange exchange = new ExchangeImpl();
+ message.setExchange(exchange);
+ exchange.setOutMessage(message);
+ setUpMessageProperty(message,
+ REQUESTOR_ROLE,
+ Boolean.TRUE);
+ AddressingPropertiesImpl maps = new AddressingPropertiesImpl();
+ EndpointReferenceType replyTo = new EndpointReferenceType();
+
replyTo.setAddress(ContextUtils.getAttributedURI(Names.WSA_ANONYMOUS_ADDRESS));
+ maps.setReplyTo(replyTo);
+ AttributedURIType id =
+ ContextUtils.getAttributedURI("urn:uuid:12345");
+ maps.setMessageID(id);
+ maps.setAction(ContextUtils.getAttributedURI(""));
+ setUpMessageProperty(message,
+ CLIENT_ADDRESSING_PROPERTIES,
+ maps);
+ aggregator.mediate(message, false);
+ AddressingProperties props =
+
(AddressingProperties)message.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND);
+ assertSame(replyTo, props.getReplyTo());
+ }
private Message setUpMessage(boolean requestor,
