Liran Zelkha has uploaded a new change for review.
Change subject: Fix StoragePool references
......................................................................
Fix StoragePool references
Change-Id: I24cc6a1ee3ee5679068bad70ec63bdf88620ad96
Signed-off-by: Liran Zelkha <liran.zel...@gmail.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/cache/CacheManager.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/cache/CacheableJdbcTemplate.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
4 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/14371/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
index 54dd08a..60c562f 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
@@ -6,7 +6,6 @@
import javax.validation.constraints.Size;
import
org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions;
-import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.utils.ValidationUtils;
import
org.ovirt.engine.core.common.validation.annotation.ValidNetworkConfiguration;
import org.ovirt.engine.core.compat.NGuid;
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/cache/CacheManager.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/cache/CacheManager.java
index aedc745..5d81326 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/cache/CacheManager.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/cache/CacheManager.java
@@ -58,7 +58,8 @@
}
// Check cache time vs object TimeToLiveInCache definition
- int timeToLiveInCache =
TimeToLiveManager.getInstance().getTimeToLive(type);
+ int timeToLiveInCache = TimeToLiveManager.getInstance().getTimeToLive(
+ type);
// Calculate how long this object has been in cache
long currentTime = System.currentTimeMillis();
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/cache/CacheableJdbcTemplate.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/cache/CacheableJdbcTemplate.java
index bb011be..532496e 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/cache/CacheableJdbcTemplate.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/cache/CacheableJdbcTemplate.java
@@ -54,12 +54,12 @@
result = (T) cacheManager.getFromCache(sql, null);
if (result == null) {
- result = super.query(sql,rse);
+ result = super.query(sql, rse);
cacheManager.putInCache(sql, null, result);
}
return result;
-// return super.query(sql, rse);
+ // return super.query(sql, rse);
}
@Override
@@ -73,11 +73,11 @@
public <T> List<T> query(String sql, RowMapper<T> rowMapper)
throws DataAccessException {
List<T> result;
-
+
result = (List<T>) cacheManager.getFromCache(sql, null);
if (result == null) {
- result = super.query(sql,rowMapper);
+ result = super.query(sql, rowMapper);
cacheManager.putInCache(sql, null, result);
}
return result;
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
index 7bb3394..9a969f1 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
@@ -6,6 +6,7 @@
import java.util.List;
import org.ovirt.engine.core.common.businessentities.NonOperationalReason;
+import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.businessentities.VDSGroup;
import org.ovirt.engine.core.common.businessentities.VDSStatus;
@@ -16,7 +17,6 @@
import org.ovirt.engine.core.common.businessentities.VdsStatic;
import org.ovirt.engine.core.common.businessentities.VdsStatistics;
import
org.ovirt.engine.core.common.businessentities.VdsTransparentHugePagesState;
-import org.ovirt.engine.core.common.businessentities.storage_pool;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.NGuid;
import org.ovirt.engine.core.compat.RpmVersion;
@@ -56,7 +56,7 @@
VDSGroup vdsGroups = groupsDao.get(vdsStatic.getVdsGroupId());
VDS vds = new VDS(vdsStatic, vdsDynamic, vdsStatistics);
-
+
vds.calculateFreeVirtualMemory();
vds.setVersion(vdsDynamic.getVersion());
vds.setVdsGroupCompatibilityVersion(vdsGroups
@@ -65,7 +65,7 @@
vds.setVdsGroupDescription(vdsGroups.getdescription());
vds.setVdsGroupName(vdsGroups.getname());
- storage_pool storage = storageDao.getForVds(vds.getId());
+ StoragePool storage = storageDao.getForVds(vds.getId());
vds.setStoragePoolId(storage.getId());
vds.setStoragePoolName(storage.getname());
--
To view, visit http://gerrit.ovirt.org/14371
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24cc6a1ee3ee5679068bad70ec63bdf88620ad96
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liran Zelkha <liran.zel...@gmail.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
