You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/23 20:19:49 UTC
git commit: updated refs/heads/4.4 to 0d23ad9
Repository: cloudstack
Updated Branches:
refs/heads/4.4 af37ade9e -> 0d23ad903
CLOUDSTACK-6971: createAutoScaleVmProfile failed with NPE due to lack of bean
injection.
(cherry picked from commit 31e250a9d2adbf9ee59da66073497e38c02ded86)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0d23ad90
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0d23ad90
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0d23ad90
Branch: refs/heads/4.4
Commit: 0d23ad903d8dabf8f7b752c5e42e3256a2e6a506
Parents: af37ade
Author: Min Chen <mi...@citrix.com>
Authored: Fri Jun 20 14:04:26 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jun 23 20:19:36 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/network/as/AutoScaleManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d23ad90/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
index d4de462..96d82ad 100644
--- a/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
+++ b/server/src/com/cloud/network/as/AutoScaleManagerImpl.java
@@ -108,6 +108,7 @@ import com.cloud.user.dao.UserDao;
import com.cloud.uservm.UserVm;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
+import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.EntityManager;
@@ -370,7 +371,7 @@ public class AutoScaleManagerImpl<Type> extends ManagerBase implements AutoScale
* For ex. if projectId is given as a string instead of an long value, this
* will be throwing an error.
*/
- dispatchChainFactory.getStandardDispatchChain().dispatch(new DispatchTask(new DeployVMCmd(), deployParams));
+ dispatchChainFactory.getStandardDispatchChain().dispatch(new DispatchTask(ComponentContext.inject(DeployVMCmd.class), deployParams));
AutoScaleVmProfileVO profileVO =
new AutoScaleVmProfileVO(cmd.getZoneId(), cmd.getDomainId(), cmd.getAccountId(), cmd.getServiceOfferingId(), cmd.getTemplateId(), cmd.getOtherDeployParams(),