Index: lib/aws/s3/bucket.rb =================================================================== --- lib/aws/s3/bucket.rb (revision 176) +++ lib/aws/s3/bucket.rb (working copy) @@ -190,6 +190,7 @@ def initialize(attributes = {}) #:nodoc: super @object_cache = [] + @objects_loaded = false build_contents! end @@ -240,7 +241,7 @@ options = {} end - reload!(options) if reload || object_cache.empty? + reload!(options) if reload || !@objects_loaded object_cache end @@ -294,6 +295,7 @@ attributes.delete('contents').each do |content| add new_object(content) end + @objects_loaded = true end def has_contents? @@ -314,6 +316,7 @@ self.class.objects(name, options).each do |object| add object end + @objects_loaded = true end end end