From 83feb6ad13187af9be55cc71408611f67d280955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Magdalena=20Grodzi=C5=84ska?= <mag.grodzinska@gmail.com>
Date: Tue, 14 Jan 2020 21:28:10 +0100
Subject: Fix timestamps and ValueQuery

---
 .../pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlState.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlState.java')

diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlState.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlState.java
index cfaf560..4709eb1 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlState.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/GossipGirlState.java
@@ -47,7 +47,7 @@ public class GossipGirlState {
     public long timeOffest;
     public State state;
     public ZMI hierarchy;
-    public Map<Attribute, Entry<ValueQuery, ValueTime>> queries;
+    public Map<Attribute, ValueQuery> queries;
     public ValueTime hejkaSendTimestamp;
     public ValueTime hejkaReceiveTimestamp;
     public ValueTime noCoTamSendTimestamp;
@@ -79,7 +79,7 @@ public class GossipGirlState {
         lastAction = ValueUtils.currentTime();
     }
 
-    public void setState(ZMI hierarchy, Map<Attribute, Entry<ValueQuery, ValueTime>> queries) {
+    public void setState(ZMI hierarchy, Map<Attribute, ValueQuery> queries) {
         switch (state) {
             case WAIT_FOR_STATE_INITIALIZER:
                 this.hierarchy = hierarchy;
@@ -211,8 +211,8 @@ public class GossipGirlState {
 
     public Map<Attribute, ValueTime> getQueryTimestampsToSend() {
         Map<Attribute, ValueTime> queryTimestamps= new HashMap();
-        for (Entry<Attribute, Entry<ValueQuery, ValueTime>> query : queries.entrySet()) {
-            queryTimestamps.put(query.getKey(), query.getValue().getValue());
+        for (Entry<Attribute, ValueQuery> query : queries.entrySet()) {
+            queryTimestamps.put(query.getKey(), new ValueTime(query.getValue().getTimestamp()));
         }
 
         return queryTimestamps;
@@ -259,7 +259,7 @@ public class GossipGirlState {
             queryList.add(
                 new SimpleImmutableEntry(
                     name,
-                    queries.get(name).getKey()
+                    queries.get(name)
                 )
             );
         }
-- 
cgit v1.2.3