From d3e4ce15e09ea3053590c80e1ae6252cddd59edc Mon Sep 17 00:00:00 2001
From: Wesley Beary <wbeary@engineyard.com>
Date: Wed, 28 Oct 2009 22:51:44 -0700
Subject: [PATCH] make collection.reload do the right thing

---
 lib/fog/aws/models/ec2/addresses.rb         | 2 +-
 lib/fog/aws/models/ec2/instances.rb         | 2 +-
 lib/fog/aws/models/ec2/key_pairs.rb         | 2 +-
 lib/fog/aws/models/ec2/security_groups.rb   | 2 +-
 lib/fog/aws/models/ec2/snapshots.rb         | 2 +-
 lib/fog/aws/models/ec2/volumes.rb           | 2 +-
 lib/fog/aws/models/s3/buckets.rb            | 2 +-
 lib/fog/aws/models/s3/objects.rb            | 4 ++--
 lib/fog/rackspace/models/servers/servers.rb | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/fog/aws/models/ec2/addresses.rb b/lib/fog/aws/models/ec2/addresses.rb
index 33fa34884..9c101d884 100644
--- a/lib/fog/aws/models/ec2/addresses.rb
+++ b/lib/fog/aws/models/ec2/addresses.rb
@@ -59,7 +59,7 @@ module Fog
         end
 
         def reload
-          all(public_ip)
+          self.clear.concat(all(public_ip))
         end
 
       end
diff --git a/lib/fog/aws/models/ec2/instances.rb b/lib/fog/aws/models/ec2/instances.rb
index 2dffee178..42ad142b7 100644
--- a/lib/fog/aws/models/ec2/instances.rb
+++ b/lib/fog/aws/models/ec2/instances.rb
@@ -56,7 +56,7 @@ module Fog
         end
 
         def reload
-          all(instance_id)
+          self.clear.concat(all(instance_id))
         end
 
       end
diff --git a/lib/fog/aws/models/ec2/key_pairs.rb b/lib/fog/aws/models/ec2/key_pairs.rb
index aa7523181..01761548f 100644
--- a/lib/fog/aws/models/ec2/key_pairs.rb
+++ b/lib/fog/aws/models/ec2/key_pairs.rb
@@ -54,7 +54,7 @@ module Fog
         end
 
         def reload
-          all(key_name)
+          self.clear.concat(all(key_name))
         end
 
       end
diff --git a/lib/fog/aws/models/ec2/security_groups.rb b/lib/fog/aws/models/ec2/security_groups.rb
index 673148019..c96bcfbd0 100644
--- a/lib/fog/aws/models/ec2/security_groups.rb
+++ b/lib/fog/aws/models/ec2/security_groups.rb
@@ -54,7 +54,7 @@ module Fog
         end
 
         def reload
-          all(group_name)
+          self.clear.concat(all(group_name))
         end
 
       end
diff --git a/lib/fog/aws/models/ec2/snapshots.rb b/lib/fog/aws/models/ec2/snapshots.rb
index 769f4daae..e1b258424 100644
--- a/lib/fog/aws/models/ec2/snapshots.rb
+++ b/lib/fog/aws/models/ec2/snapshots.rb
@@ -64,7 +64,7 @@ module Fog
         end
 
         def reload
-          all(snapshot_id)
+          self.clear.concat(all(snapshot_id))
         end
 
       end
diff --git a/lib/fog/aws/models/ec2/volumes.rb b/lib/fog/aws/models/ec2/volumes.rb
index 9dc386aaf..7dc0df2b0 100644
--- a/lib/fog/aws/models/ec2/volumes.rb
+++ b/lib/fog/aws/models/ec2/volumes.rb
@@ -61,7 +61,7 @@ module Fog
         end
 
         def reload
-          all(volume_id)
+          self.clear.concat(all(volume_id))
         end
 
       end
diff --git a/lib/fog/aws/models/s3/buckets.rb b/lib/fog/aws/models/s3/buckets.rb
index a262a59ae..15d8ba99f 100644
--- a/lib/fog/aws/models/s3/buckets.rb
+++ b/lib/fog/aws/models/s3/buckets.rb
@@ -69,7 +69,7 @@ module Fog
         end
 
         def reload
-          all
+          self.clear.concat(all)
         end
 
       end
diff --git a/lib/fog/aws/models/s3/objects.rb b/lib/fog/aws/models/s3/objects.rb
index 5cf69756b..6eb2041ee 100644
--- a/lib/fog/aws/models/s3/objects.rb
+++ b/lib/fog/aws/models/s3/objects.rb
@@ -81,12 +81,12 @@ module Fog
         end
 
         def reload
-          all({
+          self.clear.concat(all({
             'delimiter'   => @delimiter,
             'marker'      => @marker,
             'max-keys'    => @max_keys,
             'prefix'      => @prefix
-          })
+          }))
         end
 
         private
diff --git a/lib/fog/rackspace/models/servers/servers.rb b/lib/fog/rackspace/models/servers/servers.rb
index 9b8d1b4ae..9cf080c7d 100644
--- a/lib/fog/rackspace/models/servers/servers.rb
+++ b/lib/fog/rackspace/models/servers/servers.rb
@@ -42,7 +42,7 @@ module Fog
         end
 
         def reload
-          all
+          self.clear.concat(all)
         end
 
       end