From 7db0e79692c944a0710f7ec8e4db142c50b2ff72 Mon Sep 17 00:00:00 2001 From: edison Date: Mon, 6 Dec 2010 14:03:51 -0800 Subject: [PATCH] fix NPE when starting system vm --- .../src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 2 +- .../cloud/storage/secondary/SecondaryStorageManagerImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index ade8af45c69..c1a13dd90e3 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -973,7 +973,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, ConsoleProx } ConsoleProxyVO proxy = _consoleProxyDao.findById(proxyVmId); - allocProxyStorage(dataCenterId, proxyVmId); + // allocProxyStorage(dataCenterId, proxyVmId); if (proxy != null) { SubscriptionMgr.getInstance().notifySubscribers(ConsoleProxyManager.ALERT_SUBJECT, this, new ConsoleProxyAlertEventArgs(ConsoleProxyAlertEventArgs.PROXY_CREATED, dataCenterId, proxy.getId(), proxy, null)); diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index 04f3aee05f4..1bed3dc0c6d 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -711,8 +711,8 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V return null; } - //SecondaryStorageVmVO secStorageVm = _secStorageVmDao.findById(secStorageVmId); - SecondaryStorageVmVO secStorageVm = allocSecStorageVmStorage(dataCenterId, secStorageVmId); + SecondaryStorageVmVO secStorageVm = _secStorageVmDao.findById(secStorageVmId); + //SecondaryStorageVmVO secStorageVm = allocSecStorageVmStorage(dataCenterId, secStorageVmId); if (secStorageVm != null) { SubscriptionMgr.getInstance().notifySubscribers(ALERT_SUBJECT, this, new SecStorageVmAlertEventArgs(