From bbfa9bfcbde78675a2aecb3736f76f11373f6084 Mon Sep 17 00:00:00 2001
From: Likitha Shetty <likitha.shetty@citrix.com>
Date: Fri, 7 Jun 2013 11:07:37 +0530
Subject: [PATCH] CLOUDSTACK-2862. EC2Engine is not injected correctly

---
 .../cloud/bridge/service/controller/s3/ServiceProvider.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
index 0f98518d8ef..a0892cc979b 100644
--- a/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
+++ b/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java
@@ -91,8 +91,6 @@ public class ServiceProvider extends ManagerBase {
         // register service implementation object
         Transaction txn = Transaction.open(Transaction.AWSAPI_DB);
         txn.close();
-        serviceMap.put(AmazonS3SkeletonInterface.class, new S3SerializableServiceImplementation(engine));
-        serviceMap.put(AmazonEC2SkeletonInterface.class, new EC2SoapServiceImpl(EC2_engine));
     }
 
     public synchronized static ServiceProvider getInstance() {
@@ -101,7 +99,9 @@ public class ServiceProvider extends ManagerBase {
 
     @PostConstruct
     void initComponent() {
-    	instance = this;
+        serviceMap.put(AmazonS3SkeletonInterface.class, new S3SerializableServiceImplementation(engine));
+        serviceMap.put(AmazonEC2SkeletonInterface.class, new EC2SoapServiceImpl(EC2_engine));
+        instance = this;
     }
     
 	public boolean configure(String name, Map<String, Object> params)