Shahar Havivi has uploaded a new change for review. Change subject: findbugs: Potentially dangerous use of non-short-circuit logic ......................................................................
findbugs: Potentially dangerous use of non-short-circuit logic Signed-off-by: Shahar Havivi <[email protected]> Change-Id: I101e2ae3b9a1886d5394984c728e4844d1eb189f --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MigrateModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/14503/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MigrateModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MigrateModel.java index e6b19cc..094cb63 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MigrateModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/MigrateModel.java @@ -113,7 +113,7 @@ public void setIsSameVdsMessageVisible(boolean value) { - isSameVdsMessageVisible = value & gethasSameVdsMessage() & !getIsAutoSelect(); + isSameVdsMessageVisible = value && gethasSameVdsMessage() && !getIsAutoSelect(); onPropertyChanged(new PropertyChangedEventArgs("IsSameVdsMessageVisible")); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java index 8acc7c8..0be4cdc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java @@ -144,7 +144,7 @@ { VM vm = getEntity(); boolean isVmStatusApplicableForHotPlug = - vm != null && (vm.getStatus() == VMStatus.Up || vm.getStatus() == VMStatus.Down | + vm != null && (vm.getStatus() == VMStatus.Up || vm.getStatus() == VMStatus.Down || vm.getStatus() == VMStatus.Paused || vm.getStatus() == VMStatus.Suspended); return privateIsDiskHotPlugSupported && isVmStatusApplicableForHotPlug; -- To view, visit http://gerrit.ovirt.org/14503 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I101e2ae3b9a1886d5394984c728e4844d1eb189f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
