Skip to content

make deleteWithObjects() work with empty containers #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2014
Merged

make deleteWithObjects() work with empty containers #490

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ecf458
Update Container.php
joshrencher Dec 6, 2014
0bb1e63
make deleteWithObjects() work with empty containers
joshrencher Dec 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions lib/OpenCloud/ObjectStore/Resource/Container.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,16 @@ 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 = $this->getObjectCount();
if ($numObjects === 0) {
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);
}

}
// Attempt to delete all objects and container
$endTime = time() + $secondsToWait;
$containerDeleted = false;
Expand All @@ -206,7 +209,7 @@ public function deleteWithObjects($secondsToWait = null)
}
}
if (!$containerDeleted) {
throw new ContainerException('Container and all its objects cound not be deleted');
throw new ContainerException('Container could not be deleted.');
}
return $response;
}
Expand Down