lib/sqreen/condition_evaluator.rb in sqreen-1.20.4-java vs lib/sqreen/condition_evaluator.rb in sqreen-1.21.0.beta1

@@ -65,11 +65,11 @@
     # @params min_value_size [Fixnum] to compare against
     def self.hash_key_include?(values, hash, min_value_size, rem = 10)
       return true if rem <= 0
       if hash.is_a?(Array)
         return hash.any? do |v|
-          hash_key_include?(values, v, min_value_size, rem - 1)
+          ConditionEvaluator.hash_key_include?(values, v, min_value_size, rem - 1)
         end
       end
 
       return false unless hash.is_a?(Hash)
 
@@ -79,16 +79,10 @@
           false
         else
           if hkey.respond_to?(:empty?) && hkey.empty?
             false
           else
-            key_incl = if values.is_a?(String)
-                         str_include?(values, hkey.to_s)
-                       else
-                         values.include?(hkey.to_s)
-                       end
-
-            key_incl || hash_key_include?(values, hval, min_value_size, rem - 1)
+            values.include?(hkey.to_s) || ConditionEvaluator.hash_key_include?(values, hval, min_value_size, rem - 1)
           end
         end
       end
     end