From 2892469cf44fc0f20210f269604358add45ad1b5 Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelveny@gmail.com>
Date: Wed, 12 Jun 2013 15:30:24 -0700
Subject: [PATCH] Fix recent changes in DeploymentPlanner

---
 client/tomcatconf/applicationContext.xml.in            | 1 -
 server/src/com/cloud/vm/VirtualMachineManagerImpl.java | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in
index 982cc0f1dac..6b1dad641c9 100644
--- a/client/tomcatconf/applicationContext.xml.in
+++ b/client/tomcatconf/applicationContext.xml.in
@@ -650,7 +650,6 @@
 
   <bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" >
     <property name="HostAllocators" value="#{hostAllocators.Adapters}" />
-    <property name="Planners" value="#{deploymentPlanners.Adapters}" />
   </bean>
   
   <bean id="networkManagerImpl" class="com.cloud.network.NetworkManagerImpl" >
diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 931f1bf3c76..0e320e28a32 100755
--- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -213,6 +213,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
     @Inject
     protected AffinityGroupVMMapDao _affinityGroupVMMapDao;
 
+    @Inject
     protected List<DeploymentPlanner> _planners;
 
     protected List<HostAllocator> _hostAllocators;