aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-20 18:11:06 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-20 18:12:45 -0700
commite9a75451236119e1db3e5d7cc7703637d048c7f8 (patch)
tree085320b1d5f7b8815109e3e46547f68891a00993 /activesupport
parent428829fc38d06be63082e261d59f478a4b7dd354 (diff)
downloadrails-e9a75451236119e1db3e5d7cc7703637d048c7f8.tar.gz
rails-e9a75451236119e1db3e5d7cc7703637d048c7f8.tar.bz2
rails-e9a75451236119e1db3e5d7cc7703637d048c7f8.zip
Avoid uninitialized instance variable warning
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/json.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/json.rb b/activesupport/lib/active_support/json.rb
index 1e8ded12da..6d845182fb 100644
--- a/activesupport/lib/active_support/json.rb
+++ b/activesupport/lib/active_support/json.rb
@@ -43,10 +43,10 @@ module ActiveSupport
delegate :decode, :to => :backend
def backend
- @backend || begin
+ unless defined? @backend
self.backend = defined?(::JSON) ? "JSONGem" : "Yaml"
- @backend
end
+ @backend
end
def backend=(name)