lib/celluloid/tasks/task_thread.rb in celluloid-0.12.3 vs lib/celluloid/tasks/task_thread.rb in celluloid-0.12.4.pre

@@ -10,19 +10,19 @@
 
       @resume_queue = Queue.new
       @yield_mutex  = Mutex.new
       @yield_cond   = ConditionVariable.new
 
-      actor, mailbox = Thread.current[:actor], Thread.current[:mailbox]
+      actor, mailbox = Thread.current[:celluloid_actor], Thread.current[:celluloid_mailbox]
       raise NotActorError, "can't create tasks outside of actors" unless actor
 
       @thread = InternalPool.get do
         begin
           unless @resume_queue.pop.is_a?(Task::TerminatedError)
             @status = :running
-            Thread.current[:actor]   = actor
-            Thread.current[:mailbox] = mailbox
-            Thread.current[:task]    = self
+            Thread.current[:celluloid_actor]   = actor
+            Thread.current[:celluloid_mailbox] = mailbox
+            Thread.current[:celluloid_task]    = self
             actor.tasks << self
 
             yield
           end
         rescue Task::TerminatedError