JRuby fix #6 - makes .acquire return nil

Author: adamruzicka

lib/concurrent/atomic/semaphore.rb

@@ -28,13 +28,14 @@ def initialize(count)
     #   @raise [ArgumentError] if `permits` is not an integer or is less than
     #     one
     #
-    #   @return [True]
+    #   @return [Nil]
     def acquire(permits = 1)
       unless permits.is_a?(Fixnum) && permits > 0
         fail ArgumentError, 'permits must be an integer greater than zero'
       end
       @mutex.synchronize do
         try_acquire_timed(permits, nil)
+        nil
       end
     end
 
@@ -95,7 +96,7 @@ def try_acquire(permits = 1, timeout = nil)
     #
     #   @raise [ArgumentError] if `permits` is not a number or is less than one
     #
-    #   @return [True]
+    #   @return [Nil]
     def release(permits = 1)
       unless permits.is_a?(Fixnum) && permits > 0
         fail ArgumentError, 'permits must be an integer greater than zero'
@@ -104,7 +105,7 @@ def release(permits = 1)
         @free += permits
         permits.times { @condition.signal }
       end
-      true
+      nil
     end
 
     # @!macro [attach] semaphore_method_reduce_permits
@@ -117,7 +118,7 @@ def release(permits = 1)
     #
     #   @raise [ArgumentError] if `@free` - `@reduction` is less than zero
     #
-    #   @return [True]
+    #   @return [Nil]
     def reduce_permits(reduction)
       unless reduction.is_a?(Fixnum) && reduction >= 0
         fail ArgumentError, 'reduction must be an non-negative integer'
@@ -127,7 +128,7 @@ def reduce_permits(reduction)
              'cannot reduce number of available_permits below zero')
       end
       @mutex.synchronize { @free -= reduction }
-      true
+      nil 
     end
 
     private

spec/concurrent/atomic/semaphore_spec.rb

@@ -15,7 +15,7 @@
     context 'permits available' do
       it 'should return true immediately' do
         result = semaphore.acquire
-        expect(result).to be_truthy
+        expect(result).to be_nil
       end
     end
 
@@ -25,7 +25,7 @@
         Thread.new { sleep(0.2) && semaphore.release }
 
         result = semaphore.acquire
-        expect(result).to be_truthy
+        expect(result).to be_nil
         expect(semaphore.available_permits).to eq 0
       end
     end
@@ -64,10 +64,10 @@
         expect(result).to be_truthy
       end
 
-      it 'acquires after if permits are available within timeout' do
+      it 'acquires when permits are available within timeout' do
         semaphore.drain_permits
         Thread.new { sleep 0.1 && semaphore.release }
-        result = semaphore.try_acquire(1, 0.2)
+        result = semaphore.try_acquire(1, 1)
         expect(result).to be_truthy
       end
 
@@ -155,7 +155,7 @@ def subject.simulate_spurious_wake_up
 
   describe Semaphore do
     if jruby?
-      it 'inherits from JavaCountDownLatch' do
+      it 'inherits from JavaSemaphore' do
         expect(Semaphore.ancestors).to include(JavaSemaphore)
       end
     else