Author: eglynn
Date: Wed Jul 11 04:13:38 2007
New Revision: 555244
URL: http://svn.apache.org/viewvc?view=rev&rev=555244
Log:
Setting wsa:To in outgoing fault response to corresponding incoming wsa:FaultTo
as opposed to wsa:ReplyTo.
Modified:
incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
Modified:
incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java?view=diff&rev=555244&r1=555243&r2=555244
==============================================================================
---
incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
(original)
+++
incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
Wed Jul 11 04:13:38 2007
@@ -412,8 +412,11 @@
// add response-specific MAPs
AddressingPropertiesImpl inMAPs = getMAPs(message, false, false);
maps.exposeAs(inMAPs.getNamespaceURI());
- // To taken from ReplyTo in incoming MAPs
- if (maps.getTo() == null && inMAPs.getReplyTo() != null) {
+ // To taken from ReplyTo or FaultTo in incoming MAPs (depending
+ // on the fault status of the response)
+ if (isFault && inMAPs.getFaultTo() != null) {
+ maps.setTo(inMAPs.getFaultTo());
+ } else if (maps.getTo() == null && inMAPs.getReplyTo() != null) {
maps.setTo(inMAPs.getReplyTo());
}
// RelatesTo taken from MessageID in incoming MAPs
Modified:
incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java?view=diff&rev=555244&r1=555243&r2=555244
==============================================================================
---
incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
(original)
+++
incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/MAPAggregatorTest.java
Wed Jul 11 04:13:38 2007
@@ -563,7 +563,9 @@
setUpRebase(message, exchange);
}
expectedTo = decoupled
- ? "http://localhost:9999/decoupled";
+ ? fault
+ ? "http://localhost:9999/fault";
+ : "http://localhost:9999/decoupled";
: Names.WSA_ANONYMOUS_ADDRESS;
expectedRelatesTo = maps.getMessageID().getValue();
// Now verified via verifyMessage()
