[ARVADOS] updated: 1.3.0-559-g995b43b51

[Git user]

Summary of changes:
 services/api/app/controllers/application_controller.rb | 4 +++-
 services/api/lib/load_param.rb                         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

       via  995b43b51c6c651efe266446f6120e67d31f06ae (commit)
      from  18296ccf884022679b9e1f7fa85e7f6d1dbfaad0 (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 995b43b51c6c651efe266446f6120e67d31f06ae
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Tue Mar 26 22:38:43 2019 -0300

    14873: Fixes parameter handling (WIP)
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb
index 57463fe6a..b613e97a1 100644
--- a/services/api/app/controllers/application_controller.rb
+++ b/services/api/app/controllers/application_controller.rb
@@ -323,7 +323,9 @@ class ApplicationController < ActionController::Base
   def resource_attrs
     return @attrs if @attrs
     @attrs = params[resource_name]
-    if @attrs.is_a? String
+    if @attrs.nil?
+      @attrs = {}
+    elsif @attrs.is_a? String
       @attrs = Oj.strict_load @attrs, symbol_keys: true
     end
     unless [Hash, ActionController::Parameters].include? @attrs.class
diff --git a/services/api/lib/load_param.rb b/services/api/lib/load_param.rb
index e7cb21fc7..a08b8b78a 100644
--- a/services/api/lib/load_param.rb
+++ b/services/api/lib/load_param.rb
@@ -17,7 +17,7 @@ module LoadParam
   def load_where_param
     if params[:where].nil? or params[:where] == ""
       @where = {}
-    elsif params[:where].is_a? Hash
+    elsif [Hash, ActionController::Parameters].include? params[:where].class
       @where = params[:where]
     elsif params[:where].is_a? String
       begin

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


hooks/post-receive
--