Put sync.unregister() in finally. See #118

puniverse · Sep 18, 2015 · fefd6d9 · fefd6d9
1 parent ed0bb4b
commit fefd6d9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/quasar-actors/src/main/java/co/paralleluniverse/actors/SelectiveReceiveHelper.java b/quasar-actors/src/main/java/co/paralleluniverse/actors/SelectiveReceiveHelper.java
@@ -103,8 +103,13 @@ public final <T> T receive(long timeout, TimeUnit unit, MessageProcessor<? super
 			mailbox.lock();
 
 			if (it.hasNext()) {
-				final Object m = it.next();
-				mailbox.unlock();
+				final Object m;
+
+                try {
+				    m = it.next();
+			    } finally {
+				    mailbox.unlock();
+				}
 				if (m == currentMessage) {
 					it.remove();
 					continue;

diff --git a/...r-core/src/main/java/co/paralleluniverse/strands/channels/SingleConsumerQueueChannel.java b/...r-core/src/main/java/co/paralleluniverse/strands/channels/SingleConsumerQueueChannel.java
@@ -85,14 +85,17 @@ public Message receive() throws SuspendExecution, InterruptedException {
             maybeSetCurrentStrandAsOwner();
             Message m;
             Object token = sync.register();
-            for (int i = 0; (m = queue().poll()) == null; i++) {
-                if (isSendClosed()) {
-                    setReceiveClosed();
-                    checkClosed();
+            try {
+                for (int i = 0; (m = queue().poll()) == null; i++) {
+                    if (isSendClosed()) {
+                        setReceiveClosed();
+                        checkClosed();
+                    }
+                    sync.await(i);
                 }
-                sync.await(i);
+            } finally {
+                sync.unregister(token);
             }
-            sync.unregister(token);
 
             signalSenders();
             return m;