cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/master to 9045e41
Date Mon, 03 Mar 2014 06:57:36 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master cefd4ce3b -> 9045e4148


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 <dhoogland@schubergphilis.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9045e414
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9045e414
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9045e414

Branch: refs/heads/master
Commit: 9045e41483dcedfb57a9b8087bddb5115e9b8a6f
Parents: cefd4ce
Author: wrodrigues <wrodrigues@schubergphilis.com>
Authored: Thu Feb 27 08:53:13 2014 +0100
Committer: Daan Hoogland <dhoogland@schubergphilis.com>
Committed: Mon Mar 3 07:57:13 2014 +0100

----------------------------------------------------------------------
 .../src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9045e414/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
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 bbe15c8..c0d691a 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<VIF> 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");
             }


Mime
View raw message