From c212a34e1d1e2a4bfb546a664958aba168892c49 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 9 Dec 2011 09:33:36 -0800
Subject: only load converter if the encodings are different

---
 actionpack/test/template/template_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/test/template/template_test.rb')

diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index fe82504d3b..13d30a93ce 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -170,7 +170,7 @@ class TestERBTemplate < ActiveSupport::TestCase
 
     def with_external_encoding(encoding)
       old = Encoding.default_external
-      Encoding::Converter.new old, encoding
+      Encoding::Converter.new old, encoding if old != encoding
       silence_warnings { Encoding.default_external = encoding }
       yield
     ensure
-- 
cgit v1.2.3