From db99324a89a2a681c6f6b0957dac7a309bfca574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 26 Jan 2010 12:14:48 +0100
Subject: Ensure calling a method in Rails::Application does not instantiate a
 void application.

---
 railties/lib/rails/application.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/lib')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index b7e5eb7a1d..eba49e1520 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -16,10 +16,10 @@ module Rails
       alias   :configure :class_eval
 
       def instance
-        if instance_of?(Rails::Application)
-          Rails.application.instance
+        if self == Rails::Application
+          Rails.application
         else
-          @instance ||= new
+          @@instance ||= new
         end
       end
 
-- 
cgit v1.2.3