From eb904cd8fde640599fda87271729f53aa8022313 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 19 Jun 2015 14:02:13 +0200 Subject: [PATCH] findbugs: repeated condition seems c&p error the tested states sugest that EXPUNGED should be the last one Signed-off-by: Rohit Yadav This closes #491 (cherry picked from commit bb613baa2b716dfe9aa7aed08b6cdd2027395456) Signed-off-by: Rohit Yadav --- server/src/com/cloud/storage/VolumeApiServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java index 0f17a57ad4b..b45b8aa872a 100644 --- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java @@ -1105,7 +1105,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic } 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;