Summary: Fix S3 from trying to upload directories found in template dirs

Marcus Sorensen · Marcus Sorensen · commit fe9398dc7376 · 2013-01-28T09:22:56.000-07:00
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 &lt;marcus@betterservers.com&gt; 1359390176 -0700
diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java
@@ -398,7 +398,8 @@ private Answer execute(UploadTemplateToS3FromSecondaryStorageCommand cmd) {
                         @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
