Updated Branches: refs/heads/javelin e2f2f7bf3 -> 01701b1d9
Missing two files in last check-in Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/01701b1d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/01701b1d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/01701b1d Branch: refs/heads/javelin Commit: 01701b1d9cd6742d07ec39849b0af1bb7b867949 Parents: e2f2f7b Author: Kelven Yang <[email protected]> Authored: Thu Jan 3 14:10:40 2013 -0800 Committer: Kelven Yang <[email protected]> Committed: Thu Jan 3 14:11:16 2013 -0800 ---------------------------------------------------------------------- .../cloud/baremetal/BareMetalVmManagerImpl.java | 2 +- .../com/cloud/baremetal/PxeServerManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/01701b1d/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java b/server/src/com/cloud/baremetal/BareMetalVmManagerImpl.java index 255d79a..415b3b6 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()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/01701b1d/server/src/com/cloud/baremetal/PxeServerManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/baremetal/PxeServerManagerImpl.java b/server/src/com/cloud/baremetal/PxeServerManagerImpl.java index 1029790..03f91d2 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); }
