From 0d5b50ee3a6d65471f311980b9b6e49fe4b4a021 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 19 Mar 2009 03:30:01 -0700
Subject: pluginize concurrent block body part

---
 actionpack/lib/action_view/base.rb                 |  4 ++--
 .../lib/action_view/body_parts/concurrent_block.rb | 25 ----------------------
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 actionpack/lib/action_view/body_parts/concurrent_block.rb

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 3bbd2ca530..9c0134e7f7 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -288,12 +288,12 @@ module ActionView #:nodoc:
     # Access the current template being rendered.
     # Returns a ActionView::Template object.
     def template
-      Thread.current[:_current_render]
+      @_current_render
     end
 
     def template=(template) #:nodoc:
       @_first_render ||= template
-      Thread.current[:_current_render] = template
+      @_current_render = template
     end
 
     def with_template(current_template)
diff --git a/actionpack/lib/action_view/body_parts/concurrent_block.rb b/actionpack/lib/action_view/body_parts/concurrent_block.rb
deleted file mode 100644
index 28a3a3bf4d..0000000000
--- a/actionpack/lib/action_view/body_parts/concurrent_block.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module ActionView
-  module BodyParts
-    class ConcurrentBlock
-      def initialize(&block)
-        @block = block
-        @body = []
-        start
-      end
-
-      def to_s
-        finish
-        @body.join
-      end
-
-      protected
-        def start
-          @worker = Thread.new { @block.call(@body) }
-        end
-
-        def finish
-          @worker.join if @worker && @worker.alive?
-        end
-    end
-  end
-end
-- 
cgit v1.2.3