Tweaks to Queue.

jruby · Dec 19, 2015 · c75accf · c75accf
1 parent b756eaa
commit c75accf
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/core/src/main/java/org/jruby/ext/thread/Queue.java b/core/src/main/java/org/jruby/ext/thread/Queue.java
@@ -122,6 +122,7 @@ public IRubyObject pop(ThreadContext context) {
         try {
             return context.getThread().executeTask(context, this, BLOCKING_POP_TASK);
         } catch (InterruptedException ie) {
+            // FIXME: is this the right thing to do?
             throw context.runtime.newThreadError("interrupted in " + getMetaClass().getName() + "#pop");
         }
     }
@@ -137,11 +138,12 @@ public IRubyObject pop(ThreadContext context, IRubyObject arg0) {
 
     @JRubyMethod(name = {"push", "<<", "enq"})
     public IRubyObject push(ThreadContext context, IRubyObject value) {
-        if (closed) {
-            raiseClosedError(context);
-        }
         lock.lock();
         try {
+            if (closed) {
+                raiseClosedError(context);
+            }
+
             getQue().add(value);
             popCond.signal();
         } finally {
@@ -221,9 +223,6 @@ protected IRubyObject popBlocking(ThreadContext context) throws InterruptedExcep
                 return context.nil;
             }
             else {
-                assert(getQue().size() == 0);
-                assert(!closed);
-
                 popCond.await();
             }
         }