From 355173ba2e8c42b29011493d1d8c7cc4d69295c6 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Mon, 16 Jul 2018 20:43:38 -0300 Subject: [PATCH] 13803: Fix behavior change on Oj 3.x Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- services/api/lib/safe_json.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/services/api/lib/safe_json.rb b/services/api/lib/safe_json.rb index f4da283d74..f78a3d34dc 100644 --- a/services/api/lib/safe_json.rb +++ b/services/api/lib/safe_json.rb @@ -7,6 +7,12 @@ class SafeJSON return Oj.dump(o, mode: :compat) end def self.load(s) + if s.nil? or s == '' + # Oj 2.18.5 used to return nil. Not anymore on 3.6.4. + # Upgraded for performance issues (see #13803 and + # https://github.com/ohler55/oj/issues/441) + return nil + end Oj.strict_load(s, symbol_keys: false) end end -- 2.30.2