Avoid deadlocks when chaining synchronous calls

e2 · Apr 8, 2015 · 5e17eae · 5e17eae
1 parent c5ca358
commit 5e17eae
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/celluloid/proxies/sync_proxy.rb b/lib/celluloid/proxies/sync_proxy.rb
@@ -25,7 +25,11 @@ def method_missing(meth, *args, &block)
 
       if @mailbox == ::Thread.current[:celluloid_mailbox]
         args.unshift meth
-        meth = :__send__
+        # meth = :__send__
+
+        actor = Thread.current[:celluloid_actor]
+        actor = actor.behavior.subject.bare_object
+        return actor.__send__(*args)
       end
 
       call = SyncCall.new(::Celluloid.mailbox, meth, args, block)