etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix NPE when starting system vm

This commit is contained in:
edison 2010-12-06 14:03:51 -08:00
parent 10f319ecd7
commit 7db0e79692
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
View File

@ -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));

4
server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
View File

@ -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(