[ARVADOS] updated: ff6dfcb1b9bc2ed25466baffb8cacbf5daf49b57

git at public.curoverse.com git at public.curoverse.com
Thu Jul 3 21:37:26 EDT 2014


Summary of changes:
 services/api/lib/load_param.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

       via  ff6dfcb1b9bc2ed25466baffb8cacbf5daf49b57 (commit)
      from  df7ddbe4c94700abe695d8799b8fc1db1b48d02d (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 ff6dfcb1b9bc2ed25466baffb8cacbf5daf49b57
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jul 3 21:37:20 2014 -0400

    Don't raise exception if filters parameter parses to
    json "null".  no issue #

diff --git a/services/api/lib/load_param.rb b/services/api/lib/load_param.rb
index 70387fe..71678cd 100644
--- a/services/api/lib/load_param.rb
+++ b/services/api/lib/load_param.rb
@@ -34,8 +34,10 @@ module LoadParam
     elsif params[:filters].is_a? String and !params[:filters].empty?
       begin
         f = Oj.load params[:filters]
-        raise unless f.is_a? Array
-        @filters += f
+        if not f.nil?
+          raise unless f.is_a? Array
+          @filters += f
+        end
       rescue
         raise ArgumentError.new("Could not parse \"filters\" param as an array")
       end

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list