From dd7ff1d8db3a374b1a1569bd2e8ba0338ae7505e Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Wed, 7 Dec 2011 13:27:45 -0800 Subject: [PATCH] bug 12404: Fix NPE when delete host But it's not enough. This happened because delete host logic is missing for Xen. Frank would add it. --- server/src/com/cloud/resource/ResourceManagerImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 4726b2eccf0..31b68976893 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -706,6 +706,12 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma List pools = _storagePoolHostDao.listByHostIdIncludingRemoved(hostId); ResourceStateAdapter.DeleteHostAnswer answer = (ResourceStateAdapter.DeleteHostAnswer) dispatchToStateAdapters(ResourceStateAdapter.Event.DELETE_HOST, false, host, new Boolean(isForced), new Boolean(isForceDeleteStorage)); + + if (answer == null) { + s_logger.warn("Unable to delete host: " + hostId); + return false; + } + if (answer.getIsException()) { return false; }