[Engine-patches] Change in ovirt-engine[master]: core: Fix AddVdsCommand to use injection

[lzelkha]

Liran Zelkha has uploaded a new change for review.

Change subject: core: Fix AddVdsCommand to use injection
......................................................................

core: Fix AddVdsCommand to use injection

NPE on AddVdsCommand might have been created because of an
exception.

Change-Id: Ia59638d3ae3c8d6f6174669a31726c7afdd68999
Signed-off-by: lzel...@redhat.com <lzel...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java
1 file changed, 16 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/42421/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java
index 702f22d..cc06d04 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java
@@ -9,6 +9,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import javax.inject.Inject;
 import javax.naming.AuthenticationException;
 
 import org.apache.commons.lang.StringUtils;
@@ -56,6 +57,9 @@
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase;
 import org.ovirt.engine.core.dal.job.ExecutionMessageDirector;
+import org.ovirt.engine.core.dao.VdsDynamicDAO;
+import org.ovirt.engine.core.dao.VdsStaticDAO;
+import org.ovirt.engine.core.dao.VdsStatisticsDAO;
 import org.ovirt.engine.core.dao.gluster.GlusterDBUtils;
 import org.ovirt.engine.core.utils.threadpool.ThreadPoolUtil;
 import org.ovirt.engine.core.utils.transaction.TransactionMethod;
@@ -65,6 +69,15 @@
 
 @NonTransactiveCommandAttribute(forceCompensation = true)
 public class AddVdsCommand<T extends AddVdsActionParameters> extends 
VdsCommand<T> {
+
+    @Inject
+    private VdsStaticDAO vdsStaticDao;
+
+    @Inject
+    private VdsDynamicDAO vdsDynamicDao;
+
+    @Inject
+    private VdsStatisticsDAO vdsStatisticsDao;
 
     private final AuditLogType errorType = AuditLogType.USER_FAILED_ADD_VDS;
 
@@ -280,7 +293,7 @@
                 vdsStatic.setProtocol(VdsProtocol.XML);
             }
         }
-        
DbFacade.getInstance().getVdsStaticDao().save(getParameters().getVdsStaticData());
+        vdsStaticDao.save(getParameters().getVdsStaticData());
         
getCompensationContext().snapshotNewEntity(getParameters().getVdsStaticData());
         setVdsIdRef(getParameters().getVdsStaticData().getId());
         addFenceAgents();
@@ -300,14 +313,14 @@
         else if (Config.<Boolean> getValue(ConfigValues.InstallVds)) {
             vdsDynamic.setStatus(VDSStatus.Installing);
         }
-        DbFacade.getInstance().getVdsDynamicDao().save(vdsDynamic);
+        vdsDynamicDao.save(vdsDynamic);
         getCompensationContext().snapshotNewEntity(vdsDynamic);
     }
 
     private void AddVdsStatisticsToDb() {
         VdsStatistics vdsStatistics = new VdsStatistics();
         vdsStatistics.setId(getParameters().getVdsStaticData().getId());
-        DbFacade.getInstance().getVdsStatisticsDao().save(vdsStatistics);
+        vdsStatisticsDao.save(vdsStatistics);
         getCompensationContext().snapshotNewEntity(vdsStatistics);
     }
 


-- 
To view, visit https://gerrit.ovirt.org/42421
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia59638d3ae3c8d6f6174669a31726c7afdd68999
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liran Zelkha <lzel...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches