Some small fixes

2 files changed, 12 insertions, 2 deletions

diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java
index 9e2a603..79728b5 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/modules/Stanik.java
@@ -215,8 +215,8 @@ public class Stanik extends Module {
             Attribute attribute = entry.getKey();
             ValueTime timestamp = new ValueTime(entry.getValue().getTimestamp());
             ValueQuery currentTimestampedQuery = queries.get(attribute);
-            ValueTime currentQueryTimestamp = new ValueTime(currentTimestampedQuery.getTimestamp());
-            if (currentQueryTimestamp == null || ValueUtils.valueLower(currentQueryTimestamp, timestamp)) {
+            if (currentTimestampedQuery == null ||
+                    ValueUtils.valueLower(new ValueTime(currentTimestampedQuery.getTimestamp()), timestamp)) {
                 queries.put(entry.getKey(), entry.getValue());
             }
         }
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java b/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java
index 3edda69..f049603 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/model/ValueQuery.java
@@ -56,6 +56,16 @@ public class ValueQuery extends Value {
         this.timestamp = System.currentTimeMillis();
     }
 
+    public ValueQuery(String query, long timestamp) throws Exception {
+        this.code = query;
+        if (!query.isEmpty()) {
+            Yylex lex = new Yylex(new ByteArrayInputStream(query.getBytes()));
+            this.query = (new parser(lex)).pProgram();
+        }
+        this.signature = null;
+        this.timestamp = timestamp;
+    }
+
     private ValueQuery() {
         this.code = null;
         this.query = null;