gitqueue
diff --git a/‎server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java‎
Lines changed: 1 addition & 1 deletion b/‎server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java‎
Lines changed: 1 addition & 1 deletion b/‎services/secondary-storage/server/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java‎
Lines changed: 1 addition & 1 deletion
@@ -599,7 +599,7 @@ public boolean deleteSnapshotDirsForAccount(long accountId) {
                 SnapshotDataStoreVO snapshotStoreRef = _snapshotStoreDao.findBySnapshot(snapshot.getId(), DataStoreRole.Image);
 
                 if (snapshotStrategy.deleteSnapshot(snapshot.getId())) {
-                    if (snapshot.getRecurringType() == Type.MANUAL) {
+                    if (Type.MANUAL == snapshot.getRecurringType()) {
                         _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.snapshot);
                         _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.secondary_storage, new Long(snapshotStoreRef.getSize()));
                     }
 
@@ -1278,7 +1278,7 @@ protected Answer deleteSnapshot(final DeleteCommand cmd) {
             if (!snapshotDir.exists()) {
                 details = "snapshot directory " + snapshotDir.getName() + " doesn't exist";
                 s_logger.debug(details);
-                return new Answer(cmd, false, details);
+                return new Answer(cmd, true, details);
             }
             // delete snapshot in the directory if exists
             String lPath = absoluteSnapshotPath + "/*" + snapshotName + "*";
Original file line number	Diff line number	Diff line change
`@@ -599,7 +599,7 @@ public boolean deleteSnapshotDirsForAccount(long accountId) {`
`599`	`599`	`SnapshotDataStoreVO snapshotStoreRef = _snapshotStoreDao.findBySnapshot(snapshot.getId(), DataStoreRole.Image);`
`600`	`600`
`601`	`601`	`if (snapshotStrategy.deleteSnapshot(snapshot.getId())) {`
`602`		`- if (snapshot.getRecurringType() == Type.MANUAL) {`
	`602`	`+ if (Type.MANUAL == snapshot.getRecurringType()) {`
`603`	`603`	`_resourceLimitMgr.decrementResourceCount(accountId, ResourceType.snapshot);`
`604`	`604`	`_resourceLimitMgr.decrementResourceCount(accountId, ResourceType.secondary_storage, new Long(snapshotStoreRef.getSize()));`
`605`	`605`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1278,7 +1278,7 @@ protected Answer deleteSnapshot(final DeleteCommand cmd) {`
`1278`	`1278`	`if (!snapshotDir.exists()) {`
`1279`	`1279`	`details = "snapshot directory " + snapshotDir.getName() + " doesn't exist";`
`1280`	`1280`	`s_logger.debug(details);`
`1281`		`- return new Answer(cmd, false, details);`
	`1281`	`+ return new Answer(cmd, true, details);`
`1282`	`1282`	`}`
`1283`	`1283`	`// delete snapshot in the directory if exists`
`1284`	`1284`	`String lPath = absoluteSnapshotPath + "/" + snapshotName + "";`