From 69331fb3278ea63fa846648e61255eabcf1d4a18 Mon Sep 17 00:00:00 2001 From: Chetan Sarva Date: Thu, 6 Jun 2013 18:09:23 -0300 Subject: [PATCH] Fix NPE when passing adapter in load/dump options --- lib/multi_json.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/multi_json.rb b/lib/multi_json.rb index aa4a9571..d53951fb 100644 --- a/lib/multi_json.rb +++ b/lib/multi_json.rb @@ -138,7 +138,9 @@ def load(string, options={}) def current_adapter(options={}) if new_adapter = options[:adapter] - load_adapter(new_adapter) + a = load_adapter(new_adapter) + a.activate! + a else adapter end