From 54bfd7e04a0ab8c613aba3fcb2dd7e112cb35b31 Mon Sep 17 00:00:00 2001
From: Rohit Yadav <bhaisaab@apache.org>
Date: Thu, 28 Feb 2013 17:28:15 +0530
Subject: [PATCH] orchestration: Fix VirtualMachineEntityFactory to process
 spring injections

The bug was found was Harikrishna P. when iso was used, in case of Isos, the
create vm from scratch which fails due to factory being used to get the object
which is not spring injected

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
---
 .../engine/cloud/entity/api/VirtualMachineEntityFactory.java  | 3 ++-
 .../cloudstack/platform/orchestration/CloudOrchestrator.java  | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityFactory.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityFactory.java
index 2e8638eec07..e8ad8e47745 100644
--- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityFactory.java
+++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityFactory.java
@@ -16,6 +16,7 @@
 // under the License.
 package org.apache.cloudstack.engine.cloud.entity.api;
 
+import com.cloud.utils.component.ComponentContext;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.stereotype.Component;
 
@@ -24,7 +25,7 @@ public class VirtualMachineEntityFactory implements FactoryBean<VirtualMachineEn
 
 	@Override
 	public VirtualMachineEntityImpl getObject() throws Exception {
-		return new VirtualMachineEntityImpl();
+        return ComponentContext.inject(VirtualMachineEntityImpl.class.newInstance());
 	}
 
 	@Override
diff --git a/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java
index 60ea9f57cb6..f47325ae511 100755
--- a/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java
+++ b/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java
@@ -176,9 +176,7 @@ public class CloudOrchestrator implements OrchestrationService {
 
     	VirtualMachineEntityImpl vmEntity = null;
 		try {
-			//vmEntity = _vmEntityFactory.getObject();
-			vmEntity = VirtualMachineEntityImpl.class.newInstance();
-			vmEntity = ComponentContext.inject(vmEntity);
+			vmEntity = _vmEntityFactory.getObject();
 		} catch (Exception e) {
 			// add error handling here
 		}