[ARVADOS] updated: 1.1.4-599-g355173ba2

[Git user]

Summary of changes:
 services/api/lib/safe_json.rb | 6 ++++++
 1 file changed, 6 insertions(+)

       via  355173ba2e8c42b29011493d1d8c7cc4d69295c6 (commit)
      from  321e025cde18b8069dfc8977754af39f2efe505a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 355173ba2e8c42b29011493d1d8c7cc4d69295c6
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Jul 16 20:43:38 2018 -0300

    13803: Fix behavior change on Oj 3.x
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/lib/safe_json.rb b/services/api/lib/safe_json.rb
index f4da283d7..f78a3d34d 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

-----------------------------------------------------------------------


hooks/post-receive
--