Merge pull request #499 from rackspace/working

Merging working -> master in preparation for patch release

Author: ycombinator

lib/OpenCloud/ObjectStore/Resource/Container.php

@@ -179,10 +179,15 @@ public function delete($deleteObjects = false)
 
     public function deleteWithObjects($secondsToWait = null)
     {
-        // If timeout (seconds to wait) is not specified by caller, try to
-        // estimate it based on number of objects in container
+        // If container is empty, just delete it
+        $numObjects = (int) $this->retrieveMetadata()->getProperty('Object-Count');
+        if (0 === $numObjects) {
+            return $this->delete();
+        }
+
+        // If timeout ($secondsToWait) is not specified by caller,
+        // try to estimate it based on number of objects in container
         if (null === $secondsToWait) {
-            $numObjects = (int) $this->retrieveMetadata()->getProperty('Object-Count');
             $secondsToWait = round($numObjects / 2);
         }
 
@@ -205,9 +210,11 @@ public function deleteWithObjects($secondsToWait = null)
                 }
             }
         }
+
         if (!$containerDeleted) {
-            throw new ContainerException('Container and all its objects cound not be deleted');
+            throw new ContainerException('Container and all its objects could not be deleted.');
         }
+
         return $response;
     }