From 01701b1d9cd6742d07ec39849b0af1bb7b867949 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Thu, 3 Jan 2013 14:10:40 -0800 Subject: [PATCH] Missing two files in last check-in --- server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java | 2 +- server/src/com/cloud/baremetal/PxeServerManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java index 255d79a2c36..415b3b645e7 100755 --- a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java +++ b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java @@ -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()); diff --git a/server/src/com/cloud/baremetal/PxeServerManagerImpl.java b/server/src/com/cloud/baremetal/PxeServerManagerImpl.java index 1029790021f..03f91d25f38 100755 --- a/server/src/com/cloud/baremetal/PxeServerManagerImpl.java +++ b/server/src/com/cloud/baremetal/PxeServerManagerImpl.java @@ -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); }