Checking for the latest object count, not a possibly stale one.

ycombinator · ycombinator · commit c00d933355ac · 2014-12-09T19:12:15.000+05:30
diff --git a/lib/OpenCloud/ObjectStore/Resource/Container.php b/lib/OpenCloud/ObjectStore/Resource/Container.php
@@ -180,8 +180,8 @@ public function delete($deleteObjects = false)
     public function deleteWithObjects($secondsToWait = null)
     {
         // If container is empty, just delete it
-        $numObjects = $this->getObjectCount();
-        if ($numObjects === 0) {
+        $numObjects = (int) $this->retrieveMetadata()->getProperty('Object-Count');
+        if (0 === $numObjects) {
             return $this->delete();
         }
         // If timeout ($secondsToWait) is not specified by caller,

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,8 @@ public function delete($deleteObjects = false)`
`180`	`180`	`public function deleteWithObjects($secondsToWait = null)`
`181`	`181`	`{`
`182`	`182`	`// If container is empty, just delete it`
`183`		`- $numObjects = $this->getObjectCount();`
`184`		`- if ($numObjects === 0) {`
	`183`	`+ $numObjects = (int) $this->retrieveMetadata()->getProperty('Object-Count');`
	`184`	`+ if (0 === $numObjects) {`
`185`	`185`	`return $this->delete();`
`186`	`186`	`}`
`187`	`187`	`// If timeout ($secondsToWait) is not specified by caller,`