Update Container.php

As is, deleteWithObjects() will fail if container is EMPTY. This is because an object count of zero means $secondsToWait = 0, which means $endTime = time(), which means WHILE loop never runs. Quickest solution was to change "time() < $endTime" to "time() <= $endTime, but it made more sense to just delete the container if it's empty.

Author: joshrencher

lib/OpenCloud/ObjectStore/Resource/Container.php

@@ -179,34 +179,38 @@ 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 (null === $secondsToWait) {
-            $numObjects = (int) $this->retrieveMetadata()->getProperty('Object-Count');
-            $secondsToWait = round($numObjects / 2);
-        }
-
-        // Attempt to delete all objects and container
-        $endTime = time() + $secondsToWait;
-        $containerDeleted = false;
-        while ((time() < $endTime) && !$containerDeleted) {
-            $this->deleteAllObjects();
-            try {
-                $response = $this->delete();
-                $containerDeleted = true;
-            } catch (ContainerException $e) {
-                // Ignore exception and try again
-            } catch (ClientErrorResponseException $e) {
-                if ($e->getResponse()->getStatusCode() == 404) {
-                    // Container has been deleted
+        // If container is empty, just delete it
+        $numObjects = (int) $this->retrieveMetadata()->getProperty('Object-Count');
+        if ($numObjects === 0) $response = $this->delete();
+        
+        // Else attempt to delete all objects first, then delete container
+        else {
+            // If timeout (seconds to wait) is not specified by caller, try to
+            // estimate it based on number of objects in container
+            if (null === $secondsToWait) $secondsToWait = round($numObjects / 2);
+        
+            // Attempt to delete all objects and container
+            $endTime = time() + $secondsToWait;
+            $containerDeleted = false;
+            while ((time() < $endTime) && !$containerDeleted) {
+                $this->deleteAllObjects();
+                try {
+                    $response = $this->delete();
                     $containerDeleted = true;
-                } else {
-                    throw $e;
+                } catch (ContainerException $e) {
+                    // Ignore exception and try again
+                } catch (ClientErrorResponseException $e) {
+                    if ($e->getResponse()->getStatusCode() == 404) {
+                        // Container has been deleted
+                        $containerDeleted = true;
+                    } else {
+                        throw $e;
+                    }
                 }
             }
-        }
-        if (!$containerDeleted) {
-            throw new ContainerException('Container and all its objects cound not be deleted');
+            if (!$containerDeleted) {
+                throw new ContainerException('Container and all its objects could not be deleted.');
+            }
         }
         return $response;
     }