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

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

Author: david.lloyd at jboss.com
Date: 2008-04-22 13:46:44 -0400 (Tue, 22 Apr 2008)
New Revision: 4039

Modified:
   remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundRequest.java
Log:
Fix a bug where exceptions are not rethrown

Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundRequest.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundRequest.java	2008-04-22 17:21:59 UTC (rev 4038)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundRequest.java	2008-04-22 17:46:44 UTC (rev 4039)
@@ -114,7 +114,7 @@
         }
 
         public void handleException(final RemoteExecutionException exception) {
-            if (state.transitionExclusive(State.WAITING, State.DONE)) try {
+            if (state.transitionExclusive(State.WAITING, State.EXCEPTION)) try {
                 CoreOutboundRequest.this.exception = exception;
             } finally {
                 state.releaseDowngrade();
@@ -216,8 +216,6 @@
                         throw exception;
                     case DONE:
                         return reply;
-                    case WAITING:
-                        return null;
                     case TERMINATED:
                         throw new IndeterminateOutcomeException("Request terminated abruptly; outcome unknown");
                 }
@@ -237,8 +235,6 @@
                         throw exception;
                     case DONE:
                         return reply;
-                    case WAITING:
-                        return null;
                     case TERMINATED:
                         throw new IndeterminateOutcomeException("Request terminated abruptly; outcome unknown");
                 }