lib/celluloid/actor_proxy.rb in celluloid-0.11.0 vs lib/celluloid/actor_proxy.rb in celluloid-0.11.1

@@ -63,10 +63,11 @@
     end
 
     # Terminate the associated actor
     def terminate
       terminate!
-      Thread.pass while alive?
+      join
+      nil
     end
 
     # Terminate the associated actor asynchronously
     def terminate!
       raise DeadActorError, "actor already terminated" unless alive?