[Engine-patches] Change in ovirt-engine[master]: core: commited counted was missing vms

[rgolan]

Roy Golan has uploaded a new change for review.

Change subject: core: commited counted was missing vms
......................................................................

core: commited counted was missing vms

Change-Id: Id94addb1a387b5aec284325c4cc0a17ad1cab9fb
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsListFetcher.java
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/40611/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
index 1a34292..448a865 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
@@ -86,7 +86,7 @@
     private boolean mBeforeFirstRefresh = true;
     private HostMonitoring hostMonitoring;
     private boolean monitoringNeeded;
-    private List<Pair<VM, VmInternalData>> lastVmsList = 
Collections.emptyList();
+    private List<VmInternalData> lastVmsList = Collections.emptyList();
 
     public VdsManager(VDS vds, AuditLogDirector auditLogDirector) {
         this.auditLogDirector = auditLogDirector;
@@ -934,7 +934,7 @@
         mBeforeFirstRefresh = value;
     }
 
-    public List<Pair<VM, VmInternalData>> getLastVmsList() {
+    public List<VmInternalData> getLastVmsList() {
         return lastVmsList;
     }
 
@@ -943,7 +943,7 @@
      * This method is not thread safe
      * @param lastVmsList
      */
-    public void setLastVmsList(List<Pair<VM, VmInternalData>> lastVmsList) {
+    public void setLastVmsList(List<VmInternalData> lastVmsList) {
         this.lastVmsList = lastVmsList;
     }
 
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsListFetcher.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsListFetcher.java
index fb8742a..a37297d 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsListFetcher.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VmsListFetcher.java
@@ -70,7 +70,7 @@
         devicesChangedVms = new ArrayList<>();
         filterVms();
         gatherNonRunningVms(dbVms);
-        vdsManager.setLastVmsList(changedVms);
+        vdsManager.setLastVmsList(new ArrayList<>(vdsmVms.values()));
     }
 
     protected void onError() {


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

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