fixed multithreading problem

Author: Lukas Molzberger

src/main/java/org/aika/corpus/Document.java

@@ -436,17 +436,22 @@ public class Queue {
             public int compare(Node n1, Node n2) {
                 int r = Integer.compare(n1.level, n2.level);
                 if(r != 0) return r;
-                return Long.compare(n1.queueId, n2.queueId);
+
+                ThreadState th1 = n1.getThreadState(threadId, true);
+                ThreadState th2 = n2.getThreadState(threadId, true);
+                return Long.compare(th1.queueId, th2.queueId);
             }
         });
 
         private long queueIdCounter = 0;
 
 
         public void add(Node n) {
-            if(!n.isQueued) {
-                n.isQueued = true;
-                n.queueId = queueIdCounter++;
+            ThreadState th = n.getThreadState(threadId, true);
+
+            if(!th.isQueued) {
+                th.isQueued = true;
+                th.queueId = queueIdCounter++;
                 queue.add(n);
             }
         }
@@ -455,12 +460,13 @@ public void add(Node n) {
         public void processChanges() {
             while(!queue.isEmpty()) {
                 Node n = queue.pollFirst();
+                ThreadState th = n.getThreadState(threadId, true);
 
-                n.isQueued = false;
+                th.isQueued = false;
                 n.processChanges(Document.this);
 
                 if(APPLY_DEBUG_OUTPUT) {
-                    log.info("QueueId:" + n.queueId);
+                    log.info("QueueId:" + th.queueId);
                     log.info(n.toString() + "\n");
                     log.info("\n" + nodeActivationsToString( true, false));
                 }

src/main/java/org/aika/lattice/Node.java

@@ -80,10 +80,6 @@ public abstract class Node<T extends Node, A extends NodeActivation<T>> extends
     // Only the children maps are locked.
     public ReadWriteLock lock = new ReadWriteLock();
 
-
-    public boolean isQueued = false;
-    public long queueId;
-
     public ThreadState<T, A>[] threads;
 
     /**
@@ -101,6 +97,9 @@ public static class ThreadState<T extends Node, A extends NodeActivation<T>> {
 
         public long visited;
 
+        public boolean isQueued = false;
+        public long queueId;
+
         private RidVisited nullRidVisited;
         private RidVisited[] ridVisited = new RidVisited[2 * MAX_RELATIVE_RID];