fix describe_instances without :filter param

tka · Oct 3, 2010 · 32db8aa · 32db8aa
1 parent c2ee060
commit 32db8aa
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/AWS/EC2/instances.rb b/lib/AWS/EC2/instances.rb
@@ -88,7 +88,9 @@ def run_instances( options = {} )
       def describe_instances( options = {} )
         options = { :instance_id => [] }.merge(options)
         params = pathlist("InstanceId", options[:instance_id])
-        params.merge!(pathhashlist("Filter", options[:filter], {:name => 'Name', :value => 'Value'})) 
+        if options[:filter]
+          params.merge!(pathhashlist("Filter", options[:filter], {:name => 'Name', :value => 'Value'})) 
+        end
         return response_generator(:action => "DescribeInstances", :params => params)
       end