From 5dccaa1832bd92327f12520fd485b0b58eee9b18 Mon Sep 17 00:00:00 2001
From: Min Chen <min.chen@citrix.com>
Date: Wed, 11 Dec 2013 16:54:11 -0800
Subject: [PATCH] CLOUDSTACK-5454: Delete previous template and snapshot after
 migrating NFS to S3 throws Error.

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

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 79236e6ca20..71fbc97225a 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
@@ -1666,6 +1666,10 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
     protected Answer execute(final DeleteCommand cmd) {
         DataTO obj = cmd.getData();
         DataObjectType objType = obj.getObjectType();
+        if (obj.getPath() == null) {
+            // account for those fake entries for NFS migration to object store
+            return new Answer(cmd, true, "Object with null install path does not exist on image store , no need to delete");
+        }
         switch (objType) {
             case TEMPLATE:
                 return deleteTemplate(cmd);