--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/AfstandAndenRuteTask.java	2016/03/08 09:41:53	2972
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/AfstandAndenRuteTask.java	2016/03/14 07:37:34	2976
@@ -7,9 +7,9 @@
 import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import ags.utils.dataStructures.trees.thirdGenKD.KdTree;
@@ -43,7 +43,7 @@
 
 
 
-	ThreadPoolExecutor threadPool;
+	ExecutorService threadPool;
 
 	boolean isIncremental;
 
@@ -122,6 +122,8 @@
 		threadPool.shutdown(); //Calc is done now
 			 
 
+		ReloadHelper.triggerReload( "AfstandAndenRute/" + distributor );
+		
 
 		long now = System.currentTimeMillis();
 		long elapsed = now - start ;
@@ -212,9 +214,7 @@
 			db.saveBatch();
 	
 			if (test_mode == false && this.isAborted() == false) {
-				db.renameResultTables();
-				
-				ReloadHelper.triggerReload( "AfstandAndenRute/" + distributor );
+				db.renameResultTables();				
 	
 	
 			} else {
@@ -236,7 +236,7 @@
 	}
 
 	private void setupThreadPool(int max_workers) {	 
-		threadPool = (ThreadPoolExecutor) Executors.newFixedThreadPool(max_workers, new WorkerThreadFactory() );	 
+		threadPool = Executors.newFixedThreadPool(max_workers, new WorkerThreadFactory() );	 
 	}
 
 	static class WorkerThreadFactory implements ThreadFactory {