Author: dkulp
Date: Tue Mar 8 20:39:33 2011
New Revision: 1079524
URL: http://svn.apache.org/viewvc?rev=1079524&view=rev
Log:
[CXF-3381] Make sure retransmissions don't cause exceptions thrown to
the client.
Patch from Aki Yoshida applied
Added:
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
(with props)
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?rev=1079524&r1=1079523&r2=1079524&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
Tue Mar 8 20:39:33 2011
@@ -292,7 +292,7 @@ public class PhaseInterceptorChain imple
if (ex2 == null) {
ex2 = ex;
}
-
+
FaultListener flogger = (FaultListener)
message.getContextualProperty(FaultListener.class.getName());
boolean useDefaultLogging = true;
@@ -302,12 +302,12 @@ public class PhaseInterceptorChain imple
if (useDefaultLogging) {
doDefaultLogging(message, ex2, description);
}
-
-
boolean isOneWay = false;
if (message.getExchange() != null) {
- message.getExchange().put(Exception.class, ex2);
+ if (message.getContent(Exception.class) != null) {
+ message.getExchange().put(Exception.class,
ex2);
+ }
isOneWay = message.getExchange().isOneWay();
}
Added:
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java?rev=1079524&view=auto
==============================================================================
---
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
(added)
+++
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
Tue Mar 8 20:39:33 2011
@@ -0,0 +1,191 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.ws.rm;
+
+import java.io.IOException;
+import java.util.logging.Logger;
+
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.greeter_control.Greeter;
+import org.apache.cxf.greeter_control.GreeterService;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.phase.AbstractPhaseInterceptor;
+import org.apache.cxf.phase.Phase;
+import org.apache.cxf.systest.ws.util.ConnectionHelper;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.addressing.AddressingProperties;
+import org.apache.cxf.ws.rm.RMConstants;
+import org.apache.cxf.ws.rm.RMContextUtils;
+import org.apache.cxf.ws.rm.RMManager;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Tests the decoupling the soap fault handling if the fault occurs after
+ * the message is queued and retransmission is scheduled.
+ */
+public class RetransmissionQueueTest extends AbstractBusClientServerTestBase {
+ public static final String PORT = allocatePort(Server.class);
+ public static final String DECOUPLE_PORT = allocatePort("decoupled.port");
+
+ private static final Logger LOG =
LogUtils.getLogger(RetransmissionQueueTest.class);
+ private Bus bus;
+
+ public static class Server extends AbstractBusTestServerBase {
+
+ protected void run() {
+ SpringBusFactory bf = new SpringBusFactory();
+ Bus bus =
bf.createBus("/org/apache/cxf/systest/ws/rm/message-loss.xml");
+ BusFactory.setDefaultBus(bus);
+ LoggingInInterceptor in = new LoggingInInterceptor();
+ bus.getInInterceptors().add(in);
+ bus.getInFaultInterceptors().add(in);
+ LoggingOutInterceptor out = new LoggingOutInterceptor();
+ bus.getOutInterceptors().add(out);
+ bus.getOutFaultInterceptors().add(out);
+
+ GreeterImpl implementor = new GreeterImpl();
+ String address = "http://localhost:"; + PORT +
"/SoapContext/GreeterPort";
+
+ Endpoint ep = Endpoint.create(implementor);
+ ep.publish(address);
+
+ LOG.info("Published greeter endpoint.");
+ }
+
+ public static void main(String[] args) {
+ try {
+ Server s = new Server();
+ s.start();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } finally {
+ System.out.println("done!");
+ }
+ }
+ }
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ assertTrue("server did not launch correctly",
+ launchServer(Server.class));
+ }
+
+ @Test
+ public void testDecoupleFaultHandling() throws Exception {
+ SpringBusFactory bf = new SpringBusFactory();
+ bus = bf.createBus("/org/apache/cxf/systest/ws/rm/message-loss.xml");
+ BusFactory.setDefaultBus(bus);
+ LoggingInInterceptor in = new LoggingInInterceptor();
+ bus.getInInterceptors().add(in);
+ bus.getInFaultInterceptors().add(in);
+ LoggingOutInterceptor out = new LoggingOutInterceptor();
+ bus.getOutInterceptors().add(out);
+ // an interceptor to simulate a transmission error
+ TransmissionErrorSimulator tes = new TransmissionErrorSimulator();
+ bus.getOutInterceptors().add(tes);
+
+ bus.getOutFaultInterceptors().add(out);
+
+ GreeterService gs = new GreeterService();
+ final Greeter greeter = gs.getGreeterPort();
+ updateAddressPort(greeter, DecoupledClientServerTest.PORT);
+ LOG.fine("Created greeter client.");
+
+ ConnectionHelper.setKeepAliveConnection(greeter, true);
+
+ try {
+ greeter.greetMeOneWay("oneway");
+ } catch (Exception e) {
+ fail("fault thrown after queued for retransmission");
+ }
+
+ tes.setWorking(true);
+
+ long wait = 3000;
+ while (wait > 0) {
+ long start = System.currentTimeMillis();
+ try {
+ Thread.sleep(wait);
+ } catch (InterruptedException ex) {
+ // ignore
+ }
+ wait -= System.currentTimeMillis() - start;
+ }
+
+ RMManager manager = bus.getExtension(RMManager.class);
+ boolean empty = manager.getRetransmissionQueue().isEmpty();
+
+ assertTrue("RetransmissionQueue not cleared", empty);
+ }
+
+
+ static class TransmissionErrorSimulator extends
AbstractPhaseInterceptor<Message> {
+ private boolean working;
+
+ /**
+ * @param phase
+ */
+ public TransmissionErrorSimulator() {
+ super(Phase.WRITE);
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.cxf.interceptor.Interceptor#handleMessage(org.apache.cxf.message.Message)
+ */
+ public void handleMessage(Message message) throws Fault {
+ // let the create sequence message to succeed so that a valid
sequence is created
+ AddressingProperties maps =
+ RMContextUtils.retrieveMAPs(message, false, true);
+ if (maps != null
+ && maps.getAction() != null
+ &&
RMConstants.getCreateSequenceAction().equals(maps.getAction().getValue())) {
+ // spare the message
+ } else if (!working) {
+ // triggers a simulated error
+ throw new Fault(new IOException("simulated transmission
error"));
+ }
+ }
+
+ /**
+ * @return the working
+ */
+ public boolean isWorking() {
+ return working;
+ }
+
+ /**
+ * @param working the working to set
+ */
+ public void setWorking(boolean working) {
+ this.working = working;
+ }
+ }
+
+}
Propchange:
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
