Actor: Fix restart loop when Pool is used

Author: pitr-ch

lib/concurrent/actor/utils/pool.rb

@@ -37,12 +37,17 @@ def initialize(size, &worker_initializer)
         end
 
         def on_message(message)
+          command, *rest = message
+          return if [:restarted, :reset, :resumed, :terminated].include? command # ignore events from supervised actors
+
           envelope_to_redirect = if envelope.future
                                    envelope
                                  else
-                                   Envelope.new(envelope.message, Concurrent.future, envelope.sender, envelope.sender)
+                                   Envelope.new(envelope.message, Concurrent.future, envelope.sender, envelope.address)
                                  end
-          envelope.future.on_completion! &lambda { |balancer, success, value, reason| balancer << :subscribe }.curry[@balancer]
+          envelope_to_redirect.future.on_completion!(&lambda do |balancer, success, value, reason|
+                                                       balancer << :subscribe
+                                                     end.curry[@balancer])
           redirect @balancer, envelope_to_redirect
         end
       end

spec/concurrent/actor_spec.rb

@@ -317,10 +317,15 @@ def on_message(message)
         it 'supports asks' do
           pool = Concurrent::Actor::Utils::Pool.spawn! 'pool', 5 do |index|
             Concurrent::Actor::Utils::AdHoc.spawn name: "worker-#{index}", supervised: true do
-              lambda { |message| 5 + message }
+              lambda do |message|
+                fail if message == :fail
+                5 + message
+              end
             end
           end
 
+          expect(pool.ask!(5)).to eq 10
+          expect(pool.ask(:fail).reason).to be_kind_of RuntimeError
           expect(pool.ask!(5)).to eq 10
           terminate_actors pool
         end