Author: richard.opalka(a)jboss.com Date: 2008-02-29 13:59:14 -0500 (Fri, 29 Feb 2008) New Revision: 5872 Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java Log: remoting hack Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2008-02-29 17:37:42 UTC (rev 5871) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/RMChannelTask.java 2008-02-29 18:59:14 UTC (rev 5872) @@ -27,6 +27,7 @@ import java.util.concurrent.Callable; import org.jboss.logging.Logger; +import org.jboss.remoting.CannotConnectException; import org.jboss.remoting.Client; import org.jboss.remoting.InvokerLocator; import org.jboss.remoting.marshal.MarshalFactory; @@ -102,7 +103,19 @@ } else { - Object retVal = client.invoke(rmRequest.getPayload(), remotingInvocationContext); + Object retVal = null; + try + { + retVal = client.invoke(rmRequest.getPayload(), remotingInvocationContext); + } + catch (CannotConnectException cce) + { + // remoting hack - ignore NullPointerException cause + if (false == (cce.getCause() instanceof NullPointerException)) + { + throw cce; + } + } if ((null != retVal) && (false == (retVal instanceof RMMessage))) { String msg = retVal.getClass().getName() + ": '" + retVal + "'"; Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java 2008-02-29 17:37:42 UTC (rev 5871) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/transport/backchannel/RMCallbackHandlerImpl.java 2008-02-29 18:59:14 UTC (rev 5872) @@ -28,7 +28,6 @@ import org.jboss.logging.Logger; import org.jboss.remoting.InvocationRequest; -import org.jboss.remoting.transport.coyote.RequestMap; import org.jboss.ws.core.MessageTrace; import org.jboss.ws.extensions.wsrm.transport.RMMessage; import org.jboss.ws.extensions.wsrm.transport.RMUnassignedMessageListener;