From fe9398dc7376c334709784989388bfe641e809ba Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Mon, 28 Jan 2013 09:22:56 -0700 Subject: [PATCH] Summary: Fix S3 from trying to upload directories found in template dirs Detail: The S3 upload code fails on directories in the templates dir, such as "KVMHA" that gets created for KVM. This skips directories in the templates dir. BUG-ID: CLOUDSTACK-1056 Bugfix-for: 4.1 (master) Signed-off-by: Marcus Sorensen 1359390176 -0700 --- .../cloud/storage/resource/NfsSecondaryStorageResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java index a4bea9df2b4..a634c68bcd2 100755 --- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java +++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java @@ -398,7 +398,8 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements @Override public boolean accept(final File directory, final String fileName) { - return !fileName.startsWith("."); + File fileToUpload = new File(directory.getAbsolutePath() + "/" + fileName); + return !fileName.startsWith(".") && !fileToUpload.isDirectory(); } }, new ObjectNamingStrategy() { @Override