Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
findbugs: repeated condition seems c&p error
  the tested states sugest that EXPUNGED should be the last one
  • Loading branch information
DaanHoogland committed Jun 19, 2015
commit aa61c81b24c34c592e0e1549d0a35d1317b5938c
2 changes: 1 addition & 1 deletion server/src/com/cloud/storage/VolumeApiServiceImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@ public boolean deleteVolume(long volumeId, Account caller) throws ConcurrentOper
}

try {
if (volume.getState() != Volume.State.Destroy && volume.getState() != Volume.State.Expunging && volume.getState() != Volume.State.Expunging) {
if (volume.getState() != Volume.State.Destroy && volume.getState() != Volume.State.Expunging && volume.getState() != Volume.State.Expunged) {
Long instanceId = volume.getInstanceId();
if (!volService.destroyVolume(volume.getId())) {
return false;
Expand Down