[Engine-patches] Change in ovirt-engine[master]: core: Fix Coverity Scan on getVdsStaticDao method

[lzelkha]

Liran Zelkha has uploaded a new change for review.

Change subject: core: Fix Coverity Scan on getVdsStaticDao method
......................................................................

core: Fix Coverity Scan on getVdsStaticDao method

Coverity Scan marked getVdsStaticDao method name as confusing. This patch
pulls up this method to AuditLogableBase

Change-Id: I69ea5f345e6758939a01997e161cd064a4c1d7f4
Signed-off-by: lzel...@redhat.com <lzel...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
3 files changed, 3 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/32954/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
index 314c50f..adb9146 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
@@ -90,6 +90,7 @@
 import org.ovirt.engine.core.dao.GenericDao;
 import org.ovirt.engine.core.dao.StatusAwareDao;
 import org.ovirt.engine.core.dao.VdsSpmIdMapDAO;
+import org.ovirt.engine.core.dao.VdsStaticDAO;
 import org.ovirt.engine.core.utils.Deserializer;
 import org.ovirt.engine.core.utils.ReflectionUtils;
 import org.ovirt.engine.core.utils.SerializationFactory;
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java
index 2110a64..63a28c3 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVdsCommand.java
@@ -153,7 +153,7 @@
     }
 
     private void RemoveVdsStaticFromDb() {
-        getVdsStaticDao().remove(getVdsId());
+        getVdsStaticDAO().remove(getVdsId());
     }
 
     private void RemoveVdsDynamicFromDb() {
@@ -166,10 +166,6 @@
 
     protected VdsStatisticsDAO getVdsStatisticsDao() {
         return getDbFacade().getVdsStatisticsDao();
-    }
-
-    protected VdsStaticDAO getVdsStaticDao() {
-        return getDbFacade().getVdsStaticDao();
     }
 
     private boolean canRemoveVds(Guid vdsId, List<String> text) {
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
index ac5bb23..27207d2 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterCommandBase.java
@@ -140,7 +140,7 @@
     }
 
     protected boolean updateBrickServerName(GlusterBrickEntity brick, boolean 
addCanDoActionMessage) {
-        VdsStatic server = getVdsStaticDao().get(brick.getServerId());
+        VdsStatic server = getVdsStaticDAO().get(brick.getServerId());
         if ((server == null || 
!server.getVdsGroupId().equals(getVdsGroupId()))) {
             if (addCanDoActionMessage) {
                 
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_INVALID_BRICK_SERVER_ID);
@@ -176,10 +176,6 @@
 
     protected GlusterVolumeValidator createVolumeValidator() {
         return new GlusterVolumeValidator();
-    }
-
-    public VdsStaticDAO getVdsStaticDao() {
-        return getDbFacade().getVdsStaticDao();
     }
 
     protected GlusterBrickDao getGlusterBrickDao() {


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69ea5f345e6758939a01997e161cd064a4c1d7f4
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