Liron Ar has uploaded a new change for review.
Change subject: core: avoid NPE on RemoveDiskCommand (floating disk)
......................................................................
core: avoid NPE on RemoveDiskCommand (floating disk)
When attempting to remove floating disk the use of switch case on NULL
causes to NPE.
Change-Id: Ibcce291f0e410d5d603c45cb9f9cf21c740de2f1
Signed-off-by: Liron Aravot <lara...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
1 file changed, 11 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/16326/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
index 50a91e0..bf1711c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java
@@ -357,16 +357,18 @@
return null;
}
- switch (getDisk().getVmEntityType()) {
- case VM:
- return createSharedLocksForVmDisk();
- case TEMPLATE:
- return createSharedLocksForTemplateDisk();
- default:
- log.warnFormat("No shared locks are taken while removing disk of
entity: {0}",
- getDisk().getVmEntityType());
- return null;
+ if (getDisk().getVmEntityType() != null) {
+ switch (getDisk().getVmEntityType()) {
+ case VM:
+ return createSharedLocksForVmDisk();
+ case TEMPLATE:
+ return createSharedLocksForTemplateDisk();
+ }
}
+
+ log.warnFormat("No shared locks are taken while removing disk of
entity: {0}",
+ getDisk().getVmEntityType());
+ return null;
}
private Map<String, Pair<String, String>> createSharedLocksForVmDisk() {
--
To view, visit http://gerrit.ovirt.org/16326
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibcce291f0e410d5d603c45cb9f9cf21c740de2f1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Ar <lara...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
