[jboss-remoting-commits] JBoss Remoting SVN: r4612 - remoting3/trunk/core/src/main/java/org/jboss/remoting/core.

[jboss-remoting-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2008-10-22 20:12:05 -0400 (Wed, 22 Oct 2008)
New Revision: 4612

Modified:
   remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java
Log:
More post oneway cleanup

Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java	2008-10-23 00:10:17 UTC (rev 4611)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java	2008-10-23 00:12:05 UTC (rev 4612)
@@ -60,14 +60,6 @@
         executor = new RequestListenerExecutor(clientContext.getExecutor(), this);
     }
 
-    // todo - used by one-way requests... :|
-    RequestContextImpl(final ClientContextImpl clientContext) {
-        this.clientContext = clientContext;
-        //noinspection ThisEscapedInObjectConstruction
-        executor = new RequestListenerExecutor(clientContext.getExecutor(), this);
-        replyHandler = null;
-    }
-
     public ClientContext getContext() {
         return clientContext;
     }
@@ -80,12 +72,12 @@
 
     public void sendReply(final O reply) throws IOException, IllegalStateException {
         if (! closed.getAndSet(true)) {
-            if (replyHandler != null) try {
+            try {
                 replyHandler.handleReply(reply);
             } catch (IOException e) {
                 SpiUtils.safeHandleException(replyHandler, new RemoteReplyException("Remote reply failed", e));
                 throw e;
-            } else throw new IllegalStateException("Cannot send a reply to a one-way invocation");
+            }
         } else {
             throw new IllegalStateException("Reply already sent");
         }
@@ -93,9 +85,7 @@
 
     public void sendFailure(final String msg, final Throwable cause) throws IOException, IllegalStateException {
         if (! closed.getAndSet(true)) {
-            if (replyHandler != null) {
-                replyHandler.handleException(new RemoteExecutionException(msg, cause));
-            } else throw new IllegalStateException("Cannot send a reply to a one-way invocation");
+            replyHandler.handleException(new RemoteExecutionException(msg, cause));
         } else {
             throw new IllegalStateException("Reply already sent");
         }
@@ -103,12 +93,12 @@
 
     public void sendCancelled() throws IOException, IllegalStateException {
         if (! closed.getAndSet(true)) {
-            if (replyHandler != null) try {
+            try {
                 replyHandler.handleCancellation();
             } catch (IOException e) {
                 // this is highly unlikely to succeed
                 SpiUtils.safeHandleException(replyHandler, new RemoteReplyException("Remote cancellation acknowledgement failed", e));
-            } else throw new IllegalStateException("Cannot send a reply to a one-way invocation");
+            }
         } else {
             throw new IllegalStateException("Reply already sent");
         }