lib/celluloid/actor.rb in celluloid-0.12.0.pre3 vs lib/celluloid/actor.rb in celluloid-0.12.0

@@ -189,11 +189,11 @@
 
     # Run the actor loop
     def run
       begin
         while @running
-          if message = @mailbox.receive(timeout)
+          if message = @mailbox.receive(timeout_interval)
             handle_message message
           else
             # No message indicates a timeout
             @timers.fire
             @receivers.fire_timers
@@ -275,10 +275,10 @@
         handle_system_event(message)
       end
     end
 
     # How long to wait until the next timer fires
-    def timeout
+    def timeout_interval
       i1 = @timers.wait_interval
       i2 = @receivers.wait_interval
 
       if i1 and i2
         i1 < i2 ? i1 : i2