[Engine-patches] Change in ovirt-engine[master]: core: Fix confusing getStorageDomainDao() method

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: Fix confusing getStorageDomainDao() method
......................................................................

core: Fix confusing getStorageDomainDao() method

Removed getStorageDomainDao() and used the pre-existing
getStorageDoaminDAO() instead.

Change-Id: I7f4b339849f8e8aa13c9d4ad26b34a1fb63cdf32
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
2 files changed, 1 insertion(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/19309/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
index 73e3beb..6fccde7 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java
@@ -60,7 +60,7 @@
                 if (vdcReturnValue.getSucceeded()) {
                     
getReturnValue().getInternalVdsmTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList());
                 } else {
-                    StorageDomain domain = 
getStorageDomainDao().get(image.getStorageIds().get(0));
+                    StorageDomain domain = 
getStorageDomainDAO().get(image.getStorageIds().get(0));
                     failedRemoving.add(image);
                     log.errorFormat("Can't remove image id: {0} for VM id: {1} 
from domain id: {2} due to: {3}.",
                             image.getImageId(),
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
index 566fdae..5355e8e 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
@@ -38,7 +38,6 @@
 import org.ovirt.engine.core.dao.VmDeviceDAO;
 import org.ovirt.engine.core.dao.VmDynamicDAO;
 import org.ovirt.engine.core.dao.network.VmNicDao;
-import org.ovirt.engine.core.dao.StorageDomainDAO;
 import org.ovirt.engine.core.utils.GuidUtils;
 import org.ovirt.engine.core.utils.customprop.ValidationError;
 import org.ovirt.engine.core.utils.customprop.VmPropertiesUtils;
@@ -440,10 +439,6 @@
 
     protected DiskImageDAO getDiskImageDao() {
         return getDbFacade().getDiskImageDao();
-    }
-
-    protected StorageDomainDAO getStorageDomainDao(){
-        return getDbFacade().getStorageDomainDao();
     }
 
     protected boolean checkPayload(VmPayload payload, String isoPath) {


-- 
To view, visit http://gerrit.ovirt.org/19309
To unsubscribe, visit http://gerrit.ovirt.org/settings

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