jruby · Jul 23, 2015 · Jul 23, 2015
Showing with 5 additions and 8 deletions.

+3 −0 spec/ruby/core/mutex/sleep_spec.rb

+1 −0 spec/ruby/core/mutex/unlock_spec.rb

+1 −8 truffle/src/main/java/org/jruby/truffle/nodes/core/QueueNodes.java
diff --git a/spec/ruby/core/mutex/sleep_spec.rb b/spec/ruby/core/mutex/sleep_spec.rb
@@ -50,14 +50,17 @@
 
   it "relocks the mutex when woken by an exception being raised" do
     m = Mutex.new
+    locked = false
     th = Thread.new do
       m.lock
+      locked = true
       begin
         m.sleep
       rescue Exception
         m.locked?
       end
     end
+    Thread.pass until locked
     Thread.pass while th.status and th.status != "sleep"
     th.raise(Exception)
     th.value.should be_true

diff --git a/spec/ruby/core/mutex/unlock_spec.rb b/spec/ruby/core/mutex/unlock_spec.rb
@@ -16,6 +16,7 @@
     end
 
     # avoid race on mutex.lock
+    Thread.pass until mutex.locked?
     Thread.pass while th.status and th.status != "sleep"
 
     lambda { mutex.unlock }.should raise_error(ThreadError)

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/QueueNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/QueueNodes.java
@@ -77,14 +77,7 @@ public PushNode(RubyContext context, SourceSection sourceSection) {
         public RubyBasicObject push(RubyBasicObject self, final Object value) {
             final BlockingQueue<Object> queue = getQueue(self);
 
-            getContext().getThreadManager().runUntilResult(new BlockingAction<Boolean>() {
-                @Override
-                public Boolean block() throws InterruptedException {
-                    queue.put(value);
-                    return SUCCESS;
-                }
-            });
-
+            queue.add(value);
             return self;
         }