From 4850ed856f61a90954d6e8bafc1cb99da974d3f3 Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Sun, 29 Apr 2012 19:54:36 -0700 Subject: [PATCH] Remove multijson hacks since latest release is sane again --- lib/sidekiq.rb | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/lib/sidekiq.rb b/lib/sidekiq.rb index c67875ce..4466e99a 100644 --- a/lib/sidekiq.rb +++ b/lib/sidekiq.rb @@ -83,21 +83,11 @@ module Sidekiq end def self.load_json(string) - # Can't reliably detect whether MultiJson responds to load, since it's - # a reserved word. Use adapter as a proxy for new features. - if MultiJson.respond_to?(:adapter) - MultiJson.load(string) - else - MultiJson.decode(string) - end + MultiJson.decode(string) end def self.dump_json(object) - if MultiJson.respond_to?(:dump) - MultiJson.dump(object) - else - MultiJson.encode(object) - end + MultiJson.encode(object) end end