Updated Branches: refs/heads/master 971c40d98 -> bbfa9bfcb
CLOUDSTACK-2862. EC2Engine is not injected correctly Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bbfa9bfc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bbfa9bfc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bbfa9bfc Branch: refs/heads/master Commit: bbfa9bfcbde78675a2aecb3736f76f11373f6084 Parents: 971c40d Author: Likitha Shetty <[email protected]> Authored: Fri Jun 7 11:07:37 2013 +0530 Committer: Likitha Shetty <[email protected]> Committed: Tue Jun 11 10:58:49 2013 +0530 ---------------------------------------------------------------------- .../cloud/bridge/service/controller/s3/ServiceProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bbfa9bfc/awsapi/src/com/cloud/bridge/service/controller/s3/ServiceProvider.java ---------------------------------------------------------------------- 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 0f98518..a0892cc 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)
