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

Missing two files in last check-in

This commit is contained in:
Kelven Yang 2013-01-03 14:10:40 -08:00
parent e2f2f7bf3d
commit 01701b1d9c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java
View File

@ -184,7 +184,7 @@ public class BareMetalVmManagerImpl extends UserVmManagerImpl implements BareMet
* prepare() will check if current account has right for creating
* template
*/
TemplateAdapter adapter = _adapters.get(TemplateAdapterType.BareMetal.getName());
TemplateAdapter adapter = Adapters.getAdapterByName(_adapters, TemplateAdapterType.BareMetal.getName());
Long userId = UserContext.current().getCallerUserId();
userId = (userId == null ? User.UID_SYSTEM : userId);
AccountVO account = _accountDao.findById(vm.getAccountId());

2
server/src/com/cloud/baremetal/PxeServerManagerImpl.java
View File

@ -87,7 +87,7 @@ public class PxeServerManagerImpl implements PxeServerManager, ResourceStateAdap
protected PxeServerService getServiceByType(String type) {
PxeServerService _service;
_service = _services.get(type);
_service = Adapters.getAdapterByName(_services, type);
if (_service == null) {
throw new CloudRuntimeException("Cannot find PXE service for " + type);
}