Merge pull request #443 from ruby-concurrency/fix-agent-await-bug

Fixed bug in which Agent#await triggered a validation failure.

Author: jdantonio

lib/concurrent/agent.rb

@@ -545,7 +545,9 @@ def execute_next_job
       new_value     = job.action.call(old_value, *job.args)
       @caller.value = nil
 
-      if new_value != AWAIT_FLAG && ns_validate(new_value)
+      return if new_value == AWAIT_FLAG
+
+      if ns_validate(new_value)
         @current.value = new_value
         observers.notify_observers(Time.now, old_value, new_value)
       else

spec/concurrent/agent_spec.rb

@@ -800,6 +800,16 @@ def update(time, old_value, new_value)
           expect(subject.value).to eq expected
         end
 
+        it 'does not trigger the error mode' do
+          subject = Agent.new(10)
+          subject.send{ |x| sleep(0.1); x + 1 }
+          subject.await_for(1)
+
+          expect(subject.value).to eq 11
+          expect(subject).to_not be_failed
+          expect(subject.error).to be nil
+        end
+
         it 'does not trigger observers' do
           observer_class = Class.new do
             attr_reader :count
@@ -989,7 +999,7 @@ def update(time, old_value, new_value)
           subject.send_via(executor){ sleep(1) }
           5.times{ subject.send_via(executor){ nil } }
           expect {
-            subject.await_for!(0.1) 
+            subject.await_for!(0.1)
           }.to raise_error(Concurrent::TimeoutError)
         end
 
@@ -1004,7 +1014,7 @@ def update(time, old_value, new_value)
           t = Thread.new{ subject.restart(42, clear_actions: true) }
 
           expect {
-            subject.await_for!(0.2) 
+            subject.await_for!(0.2)
           }.to raise_error(Concurrent::TimeoutError)
         end
       end