From 2c9cc1ecde74d0ed7d37fe4ee86493d26f1bcc3b Mon Sep 17 00:00:00 2001
From: Daan Hoogland <daan@onecht.net>
Date: Mon, 5 Jan 2015 16:05:57 +0100
Subject: [PATCH] CID-1261666 added null check

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

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 45cdaf946a5..bbd5376bf1d 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;
                     }