From 8024f2cc70c31ab22efe574e866cc9de7a48da28 Mon Sep 17 00:00:00 2001
From: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Date: Thu, 30 Jan 2014 13:12:59 +0530
Subject: [PATCH] CLOUDSTACK-5900: Failed to delete template/ISO that failed to
 download.

---
 .../storage/resource/NfsSecondaryStorageResource.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 0ce36ed9beb..39d5b484dde 100755
--- a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -1740,11 +1740,12 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
                 parent += File.separator;
             }
             String absoluteTemplatePath = parent + relativeTemplatePath;
-            File tmpltParent;
-            if(absoluteTemplatePath.endsWith(String.valueOf(obj.getId()))) {
-                tmpltParent = new File(absoluteTemplatePath);
+            File tmpltPath = new File(absoluteTemplatePath);
+            File tmpltParent = null;
+            if(tmpltPath.exists() && tmpltPath.isDirectory()) {
+                tmpltParent = tmpltPath;
             } else {
-                tmpltParent = new File(absoluteTemplatePath).getParentFile();
+                tmpltParent = tmpltPath.getParentFile();
             }
             String details = null;
             if (!tmpltParent.exists()) {