diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index 7da1c0392f7..9a5c52a98ab 100755 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -719,7 +719,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma SnapshotVO snapshot = _snapshotDao.findById(snapshotId); if (snapshot.getBackupSnapshotId() != null) { List snaps = _snapshotDao.listByBackupUuid(snapshot.getVolumeId(), snapshot.getBackupSnapshotId()); - if (!snaps.isEmpty()) { + if ( snaps != null && snaps.size() > 1 ) { snapshot.setBackupSnapshotId(null); _snapshotDao.update(snapshot.getId(), snapshot); } @@ -756,7 +756,7 @@ public class SnapshotManagerImpl implements SnapshotManager, SnapshotService, Ma String BackupSnapshotId = lastSnapshot.getBackupSnapshotId(); if (BackupSnapshotId != null) { List snaps = _snapshotDao.listByBackupUuid(lastSnapshot.getVolumeId(), BackupSnapshotId); - if (snaps != null && !snaps.isEmpty()) { + if ( snaps != null && snaps.size() > 1) { lastSnapshot.setBackupSnapshotId(null); _snapshotDao.update(lastSnapshot.getId(), lastSnapshot); } else {