You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/05/21 18:20:29 UTC
svn commit: r1484853 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/interceptor/
api/src/main/java/org/apache/cxf/transport/
api/src/main/java/org/apache/cxf/ws/addressing/
rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/
rt/bindings/co...
Author: dkulp
Date: Tue May 21 16:20:29 2013
New Revision: 1484853
URL: http://svn.apache.org/r1484853
Log:
Remove unused params to Destination.getBackChannel
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java
cxf/trunk/api/src/main/java/org/apache/cxf/transport/Destination.java
cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/ObjectBindingTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java
cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java Tue May 21 16:20:29 2013
@@ -117,7 +117,7 @@ public class OneWayProcessorInterceptor
partial.remove(Message.CONTENT_TYPE);
partial.setExchange(message.getExchange());
Conduit conduit = message.getExchange().getDestination()
- .getBackChannel(message, null, null);
+ .getBackChannel(message);
if (conduit != null) {
message.getExchange().setInMessage(null);
//for a one-way, the back channel could be
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java Tue May 21 16:20:29 2013
@@ -96,7 +96,7 @@ public class OutgoingChainInterceptor ex
if (ex.getConduit(message) == null
&& ex.getDestination() != null) {
try {
- conduit = ex.getDestination().getBackChannel(ex.getInMessage(), null, null);
+ conduit = ex.getDestination().getBackChannel(ex.getInMessage());
ex.put(ConduitSelector.class,
new PreexistingConduitSelector(conduit, ex.get(Endpoint.class)));
} catch (IOException e) {
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/transport/AbstractDestination.java Tue May 21 16:20:29 2013
@@ -61,21 +61,16 @@ public abstract class AbstractDestinatio
}
/**
- * Retreive a back-channel Conduit, which must be policy-compatible
+ * Retrieve a back-channel Conduit, which must be policy-compatible
* with the current Message and associated Destination. For example
* compatible Quality of Protection must be asserted on the back-channel.
* This would generally only be an issue if the back-channel is decoupled.
*
* @param inMessage the current inbound message (null to indicate a
* disassociated back-channel)
- * @param partialResponse in the decoupled case, this is expected to be the
- * outbound Message to be sent over the in-built back-channel.
- * @param address the backchannel address (null to indicate anonymous)
* @return a suitable Conduit
*/
- public Conduit getBackChannel(Message inMessage,
- Message partialResponse,
- EndpointReferenceType address)
+ public Conduit getBackChannel(Message inMessage)
throws IOException {
return getInbuiltBackChannel(inMessage);
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/transport/Destination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/transport/Destination.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/transport/Destination.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/transport/Destination.java Tue May 21 16:20:29 2013
@@ -41,13 +41,9 @@ public interface Destination extends Obs
* compatible Quality of Protection must be asserted on the back-channel.
*
* @param inMessage the current message
- * @param unused1 - will likely always be null
- * @param unused2 - will likely always be null
* @return a suitable Conduit
*/
- Conduit getBackChannel(Message inMessage,
- Message unused1,
- EndpointReferenceType unused2)
+ Conduit getBackChannel(Message inMessage)
throws IOException;
/**
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java Tue May 21 16:20:29 2013
@@ -611,8 +611,7 @@ public final class ContextUtils {
public EndpointReferenceType getAddress() {
return reference;
}
- public Conduit getBackChannel(Message inMessage, Message partialResponse,
- EndpointReferenceType address) throws IOException {
+ public Conduit getBackChannel(Message inMessage) throws IOException {
Bus bus = inMessage.getExchange().get(Bus.class);
//this is a response targeting a decoupled endpoint. Treat it as a oneway so
//we don't wait for a response.
Modified: cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java (original)
+++ cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java Tue May 21 16:20:29 2013
@@ -110,9 +110,7 @@ public class CorbaDestination implements
return reference;
}
- public Conduit getBackChannel(Message inMessage,
- Message partialResponse,
- EndpointReferenceType ref)
+ public Conduit getBackChannel(Message inMessage)
throws IOException {
return new CorbaServerConduit(endpointInfo, reference, obj,
orb, orbConfig, typeMap);
Modified: cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java (original)
+++ cxf/trunk/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java Tue May 21 16:20:29 2013
@@ -59,7 +59,7 @@ public class CorbaDestinationTest extend
assertTrue("EndpointInfo should not be null", e2 != null);
Message m = new MessageImpl();
- CorbaServerConduit serverConduit = (CorbaServerConduit)destination.getBackChannel(m, m, rtype);
+ CorbaServerConduit serverConduit = (CorbaServerConduit)destination.getBackChannel(m);
assertNotNull("CorbaServerConduit should not be null", serverConduit);
}
Modified: cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/ObjectBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/ObjectBindingTest.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/ObjectBindingTest.java (original)
+++ cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/ObjectBindingTest.java Tue May 21 16:20:29 2013
@@ -122,7 +122,7 @@ public class ObjectBindingTest extends A
inMsg.getExchange().setInMessage(outMsg);
try {
- Conduit backChannel = d.getBackChannel(inMsg, null, null);
+ Conduit backChannel = d.getBackChannel(inMsg);
backChannel.prepare(outMsg);
backChannel.close(outMsg);
} catch (IOException e) {
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/EndpointImplTest.java Tue May 21 16:20:29 2013
@@ -252,7 +252,7 @@ public class EndpointImplTest extends Ab
public void onMessage(Message message) {
try {
- Conduit backChannel = message.getDestination().getBackChannel(message, null, null);
+ Conduit backChannel = message.getDestination().getBackChannel(message);
backChannel.prepare(message);
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/MessageReplayObserver.java Tue May 21 16:20:29 2013
@@ -44,7 +44,7 @@ public class MessageReplayObserver imple
}
in.close();
- Conduit backChannel = message.getDestination().getBackChannel(message, null, null);
+ Conduit backChannel = message.getDestination().getBackChannel(message);
backChannel.prepare(message);
Modified: cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java (original)
+++ cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetInterceptor.java Tue May 21 16:20:29 2013
@@ -102,7 +102,7 @@ public class WSDLGetInterceptor extends
message.getExchange().getEndpoint().getEndpointInfo())) {
try {
- Conduit c = message.getExchange().getDestination().getBackChannel(message, null, null);
+ Conduit c = message.getExchange().getDestination().getBackChannel(message);
Message mout = new MessageImpl();
mout.setExchange(message.getExchange());
message.getExchange().setOutMessage(mout);
Modified: cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java (original)
+++ cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ServerFactoryTest.java Tue May 21 16:20:29 2013
@@ -120,9 +120,7 @@ public class ServerFactoryTest extends A
return null;
}
- public Conduit getBackChannel(Message inMessage,
- Message partialResponse,
- EndpointReferenceType address) throws IOException {
+ public Conduit getBackChannel(Message inMessage) throws IOException {
// TODO Auto-generated method stub
return null;
}
Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java Tue May 21 16:20:29 2013
@@ -98,7 +98,6 @@ public class JettyHTTPDestinationTest ex
private Conduit decoupledBackChannel;
private EndpointInfo endpointInfo;
private EndpointReferenceType address;
- private EndpointReferenceType replyTo;
private JettyHTTPServerEngine engine;
private HTTPServerPolicy policy;
private JettyHTTPDestination destination;
@@ -141,7 +140,6 @@ public class JettyHTTPDestinationTest ex
transportFactory = null;
decoupledBackChannel = null;
address = null;
- replyTo = null;
engine = null;
request = null;
response = null;
@@ -357,7 +355,7 @@ public class JettyHTTPDestinationTest ex
setUpDoService(false);
destination.doService(request, response);
setUpInMessage();
- Conduit backChannel = destination.getBackChannel(inMessage, null, null);
+ Conduit backChannel = destination.getBackChannel(inMessage);
assertNotNull("expected back channel", backChannel);
assertEquals("unexpected target",
@@ -372,7 +370,7 @@ public class JettyHTTPDestinationTest ex
destination.doService(request, response);
setUpInMessage();
Conduit backChannel =
- destination.getBackChannel(inMessage, null, null);
+ destination.getBackChannel(inMessage);
outMessage = setUpOutMessage();
backChannel.prepare(outMessage);
verifyBackChannelSend(backChannel, outMessage, 200);
@@ -385,7 +383,7 @@ public class JettyHTTPDestinationTest ex
destination.doService(request, response);
setUpInMessage();
Conduit backChannel =
- destination.getBackChannel(inMessage, null, null);
+ destination.getBackChannel(inMessage);
outMessage = setUpOutMessage();
backChannel.prepare(outMessage);
verifyBackChannelSend(backChannel, outMessage, 500);
@@ -398,7 +396,7 @@ public class JettyHTTPDestinationTest ex
destination.doService(request, response);
setUpInMessage();
Conduit backChannel =
- destination.getBackChannel(inMessage, null, null);
+ destination.getBackChannel(inMessage);
outMessage = setUpOutMessage();
backChannel.prepare(outMessage);
verifyBackChannelSend(backChannel, outMessage, 500, true);
@@ -407,7 +405,6 @@ public class JettyHTTPDestinationTest ex
@Test
public void testGetBackChannelSendDecoupled() throws Exception {
destination = setUpDestination(false, false);
- replyTo = getEPR(NOWHERE + "response/foo");
setUpDoService(false, true, true, 202);
destination.doService(request, response);
setUpInMessage();
@@ -415,13 +412,13 @@ public class JettyHTTPDestinationTest ex
Message partialResponse = setUpOutMessage();
partialResponse.put(Message.PARTIAL_RESPONSE_MESSAGE, Boolean.TRUE);
Conduit partialBackChannel =
- destination.getBackChannel(inMessage, partialResponse, replyTo);
+ destination.getBackChannel(inMessage);
partialBackChannel.prepare(partialResponse);
verifyBackChannelSend(partialBackChannel, partialResponse, 202);
outMessage = setUpOutMessage();
Conduit fullBackChannel =
- destination.getBackChannel(inMessage, null, replyTo);
+ destination.getBackChannel(inMessage);
fullBackChannel.prepare(outMessage);
}
Modified: cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java (original)
+++ cxf/trunk/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java Tue May 21 16:20:29 2013
@@ -437,7 +437,7 @@ public class JMSDestinationTest extends
// setup the message for
Conduit backConduit;
try {
- backConduit = destination.getBackChannel(m, null, null);
+ backConduit = destination.getBackChannel(m);
// wait for the message to be got from the conduit
Message replyMessage = new MessageImpl();
sendoutMessage(backConduit, replyMessage, true);
@@ -501,7 +501,7 @@ public class JMSDestinationTest extends
// setup the message for
Conduit backConduit;
try {
- backConduit = destination.getBackChannel(m, null, null);
+ backConduit = destination.getBackChannel(m);
// wait for the message to be got from the conduit
Message replyMessage = new MessageImpl();
// copy the message encoding
Modified: cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java (original)
+++ cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java Tue May 21 16:20:29 2013
@@ -87,7 +87,7 @@ public class LocalTransportFactoryTest e
public void onMessage(Message message) {
try {
message.getExchange().setInMessage(message);
- Conduit backChannel = message.getDestination().getBackChannel(message, null, null);
+ Conduit backChannel = message.getDestination().getBackChannel(message);
InputStream in = message.getContent(InputStream.class);
assertNotNull(in);
Modified: cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java (original)
+++ cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java Tue May 21 16:20:29 2013
@@ -116,9 +116,7 @@ final class InternalContextUtils {
if (reference == null) {
reference = ContextUtils.getNoneEndpointReference();
}
- Conduit backChannel = target.getBackChannel(inMessage,
- partialResponse,
- reference);
+ Conduit backChannel = target.getBackChannel(inMessage);
Exception exception = inMessage.getContent(Exception.class);
//Add this to handle two way faultTo
//TODO:Look at how to refactor
@@ -294,8 +292,7 @@ final class InternalContextUtils {
public EndpointReferenceType getAddress() {
return reference;
}
- public Conduit getBackChannel(Message inMessage, Message partialResponse,
- EndpointReferenceType address) throws IOException {
+ public Conduit getBackChannel(Message inMessage) throws IOException {
Bus bus = inMessage.getExchange().get(Bus.class);
//this is a response targeting a decoupled endpoint. Treat it as a oneway so
//we don't wait for a response.
Modified: cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java (original)
+++ cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/impl/MAPAggregatorTest.java Tue May 21 16:20:29 2013
@@ -781,9 +781,7 @@ public class MAPAggregatorTest extends A
Destination target = control.createMock(Destination.class);
setUpMessageDestination(message, target);
Conduit backChannel = control.createMock(Conduit.class);
- target.getBackChannel(EasyMock.eq(message),
- EasyMock.isA(Message.class),
- EasyMock.isA(EndpointReferenceType.class));
+ target.getBackChannel(EasyMock.eq(message));
EasyMock.expectLastCall().andReturn(backChannel);
// REVISIT test interceptor chain setup & send
}
Modified: cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java (original)
+++ cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java Tue May 21 16:20:29 2013
@@ -127,7 +127,7 @@ public class Destination extends Abstrac
try {
message.getInterceptorChain().abort();
Conduit conduit = message.getExchange().getDestination()
- .getBackChannel(message, null, null);
+ .getBackChannel(message);
if (conduit != null) {
//for a one-way, the back channel could be
//null if it knows it cannot send anything.
Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/PushBack401.java Tue May 21 16:20:29 2013
@@ -37,7 +37,6 @@ import org.apache.cxf.phase.AbstractPhas
import org.apache.cxf.phase.Phase;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.http.Headers;
-import org.apache.cxf.ws.addressing.EndpointReferenceType;
/*
* This interceptor will issue 401s
@@ -205,10 +204,8 @@ public class PushBack401 extends Abstrac
*/
private Conduit getConduit(Message message) throws IOException {
Exchange exchange = message.getExchange();
- EndpointReferenceType target =
- exchange.get(EndpointReferenceType.class);
Conduit conduit =
- exchange.getDestination().getBackChannel(message, null, target);
+ exchange.getDestination().getBackChannel(message);
exchange.setConduit(conduit);
return conduit;
}
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java?rev=1484853&r1=1484852&r2=1484853&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/MtomServerTest.java Tue May 21 16:20:29 2013
@@ -236,7 +236,7 @@ public class MtomServerTest extends Abst
ExchangeImpl ex = new ExchangeImpl();
ex.setInMessage(message);
- Conduit backChannel = message.getDestination().getBackChannel(message, null, null);
+ Conduit backChannel = message.getDestination().getBackChannel(message);
MessageImpl res = new MessageImpl();
res.put(Message.CONTENT_TYPE, "text/xml");