fixed serious problem in GHWorker if work is already done before wait is called

Author: Peter

core/src/main/java/com/graphhopper/storage/index/LocationIndexTree.java

@@ -30,10 +30,7 @@
 import gnu.trove.list.array.TIntArrayList;
 import gnu.trove.procedure.TIntProcedure;
 import gnu.trove.set.hash.TIntHashSet;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,7 +57,7 @@ public class LocationIndexTree implements LocationIndex
     private byte[] shifts;
     // convert spatial key to index for subentry of current depth
     private long[] bitmasks;
-    SpatialKeyAlgo keyAlgo;
+    protected SpatialKeyAlgo keyAlgo;
     private int minResolutionInMeter = 500;
     private double deltaLat;
     private double deltaLon;
@@ -551,7 +548,7 @@ TIntArrayList getEntries()
         return new TIntArrayList(entries);
     }
 
-    // fillIDs according to how they are stored    
+    // fillIDs according to how they are stored
     void fillIDs( long keyPart, int intIndex, TIntHashSet set, int depth )
     {
         long pointer = (long) intIndex << 2;
@@ -623,7 +620,7 @@ public QueryResult findClosest( final double queryLat, final double queryLon,
             final EdgeFilter edgeFilter )
     {
         final TIntHashSet storedNetworkEntryIds = findNetworkEntries(queryLat, queryLon);
-        final QueryResult closestMatch = new QueryResult(queryLat, queryLon);
+        final QueryResult closestMatch = new QueryResult(queryLat, queryLon);               
         if (storedNetworkEntryIds.isEmpty())
             return closestMatch;
 

core/src/main/java/com/graphhopper/util/Measurement.java

@@ -111,7 +111,7 @@ void start( CmdArgs args )
         {
             maxNode = g.getNodes();
             printGraphDetails(g);
-            printLocation2IDQuery(g, hopper.getLocationIndex(), count);
+            printLocationIndexQuery(g, hopper.getLocationIndex(), count);
 
             // Route via dijkstrabi. Normal routing takes a lot of time => smaller query number than CH
             // => values are not really comparable to routingCH as e.g. the mean distance etc is different            
@@ -158,7 +158,7 @@ private void printGraphDetails( GraphStorage g )
         put("graph.encoder", g.getEncodingManager().getSingle().toString());
     }
 
-    private void printLocation2IDQuery( Graph g, final LocationIndex idx, int count )
+    private void printLocationIndexQuery( Graph g, final LocationIndex idx, int count )
     {
         count *= 2;
         final BBox bbox = g.getBounds();

web/src/main/java/com/graphhopper/http/GHThreadPool.java

@@ -34,10 +34,10 @@
  */
 public class GHThreadPool
 {
-    private Logger logger = LoggerFactory.getLogger(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
     private final ExecutorService service;
     private final int threads;
-    private BlockingQueue<GHWorker> resolverQueue;
+    private final BlockingQueue<GHWorker> resolverQueue;
 
     public GHThreadPool( int queueSize, int threads )
     {
@@ -141,7 +141,8 @@ public void waitFor( List<GHWorker> workers, long timeOutInMillis )
                 long tmp = System.currentTimeMillis();
                 synchronized (w)
                 {
-                    w.wait(timeOutInMillis);
+                    if (w.isAlive())
+                        w.wait(timeOutInMillis);
                 }
                 remainingTimeout -= (System.currentTimeMillis() - tmp);
                 if (remainingTimeout < 10)
@@ -157,8 +158,9 @@ public void waitFor( List<GHWorker> workers, long timeOutInMillis )
 
     public static abstract class GHWorker implements Runnable
     {
-        private long maxLiveTimeInMillis = 5000;
-        private long startTime = -1;
+        private final long maxLiveTimeInMillis;
+        private volatile long startTime = -1;
+        private volatile boolean alive = true;
 
         public GHWorker( long maxLiveTimeInMillis )
         {
@@ -174,24 +176,29 @@ private GHWorker doEnqueue()
         private boolean isTimedOut()
         {
             if (startTime < 0)
-            {
                 throw new IllegalStateException("Call doEnqueue before");
-            }
+
             return (System.currentTimeMillis() - startTime) > maxLiveTimeInMillis;
         }
 
         public abstract String getName();
 
+        public boolean isAlive()
+        {
+            return alive;
+        }
+
         @Override
         public String toString()
         {
             return getName();
         }
 
         private void finish()
-        {
+        {            
             synchronized (this)
             {
+                alive = false;
                 notifyAll();
             }
         }