Repository: jclouds Updated Branches: refs/heads/2.1.x e59ccbff8 -> d8ab673da
Correct precondition Follow on to 1ae735bb7d8fa4d512e744f79582477efdfd7f26. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/d8ab673d Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/d8ab673d Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/d8ab673d Branch: refs/heads/2.1.x Commit: d8ab673da9380bab90f4794d54ea89ae094d8e7b Parents: e59ccbf Author: Andrew Gaul <[email protected]> Authored: Wed Nov 14 14:53:05 2018 -0800 Committer: Andrew Gaul <[email protected]> Committed: Wed Nov 14 14:53:44 2018 -0800 ---------------------------------------------------------------------- .../strategy/internal/FilesystemStorageStrategyImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/d8ab673d/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java ---------------------------------------------------------------------- diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java index b51124b..0442c71 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java @@ -250,7 +250,7 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy { public void clearContainer(String container, ListContainerOptions options) { filesystemContainerNameValidator.validate(container); // TODO: these require calling removeDirectoriesTreeOfBlobKey - checkArgument(options.getDir() == null || options.getPrefix() == null, "cannot specify directory or prefix"); + checkArgument(options.getDir() == null && options.getPrefix() == null, "cannot specify directory or prefix"); try { File containerFile = openFolder(container); File[] children = containerFile.listFiles();
