From 9045e41483dcedfb57a9b8087bddb5115e9b8a6f Mon Sep 17 00:00:00 2001 From: wrodrigues Date: Thu, 27 Feb 2014 08:53:13 +0100 Subject: [PATCH] fix for Find Bugs findings on troubling issues: returning null when expected is boolean; adding 6 unit tests and fix 1 in the KVMFencer; comparing objects with == instead of equals() Signed-off-by: Daan Hoogland --- .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index bbe15c8730d..c0d691ad5ba 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -884,7 +884,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe Set dom0Vifs = dom0.getVIFs(conn); for (VIF vif : dom0Vifs) { vif.getRecord(conn); - if (vif.getNetwork(conn).getUuid(conn) == nw.getUuid(conn)) { + if (vif.getNetwork(conn).getUuid(conn).equals(nw.getUuid(conn))) { dom0vif = vif; s_logger.debug("A VIF for dom0 has already been found - No need to create one"); }