cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject [21/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4
Date Tue, 06 Jan 2015 15:33:35 GMT
CID-1261666 added null check


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

Branch: refs/heads/vmware-disk-controllers
Commit: 2c9cc1ecde74d0ed7d37fe4ee86493d26f1bcc3b
Parents: 5251fb2
Author: Daan Hoogland <daan@onecht.net>
Authored: Mon Jan 5 16:05:57 2015 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jan 5 16:05:57 2015 +0100

----------------------------------------------------------------------
 .../cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c9cc1ec/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
index 45cdaf9..bbd5376 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
@@ -161,7 +161,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer,
L
                 PoolPatch poolPatch = PoolPatch.getByUuid(conn, hotFixUuid);
                 for(HostPatch patch : patches) {
                     PoolPatch pp = patch.getPoolPatch(conn);
-                    if (pp.equals(poolPatch) && patch.getApplied(conn)) {
+                    if (pp != null && pp.equals(poolPatch) && patch.getApplied(conn))
{
                         s_logger.debug("host " + hostIp + " does have " + hotFixUuid +" Hotfix.");
                         return true;
                     }


Mime
View raw message