--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/LookupMain.java	2015/02/09 13:21:39	2259
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/LookupMain.java	2015/02/10 16:27:15	2263
@@ -34,12 +34,7 @@
 	static ThreadPoolExecutor threadPool;
 
 	private static void setupThreadPool() {
-		threadPool = (ThreadPoolExecutor) Executors.newFixedThreadPool(max_workers, new ThreadFactory() {
-			@Override
-			public Thread newThread(Runnable r) {
-				return new Thread(r, "lookupWorker");
-			}	
-		});
+		threadPool = (ThreadPoolExecutor) Executors.newFixedThreadPool(max_workers, new WorkerThreadFactory() );
 	}
 	
 	
@@ -90,8 +85,6 @@
 		Constants consts = Constants.getInstance();
 		
 		Database db = new Database(conf);
-		
-		
 
 		
 		boolean testRun= false;
@@ -111,12 +104,10 @@
 				bbox.validateBbox();
 			}
 			
-			if (consts.doExtendedLookup()) {
-				logger.info("Henter alle daekkede adresser");
-				alleDaekkedeAdresser = db.hentAlleDaekkedeAdresser();
-				logger.info( "AlleDaekkedeAdresser.length=" + alleDaekkedeAdresser.length);
-			}
-			
+
+			logger.info("Henter alle daekkede adresser");
+			alleDaekkedeAdresser = db.hentAlleDaekkedeAdresser();
+			logger.info( "AlleDaekkedeAdresser.length=" + alleDaekkedeAdresser.length);			
 			
 			//pre-check er ok - reset tmp tabel og start søgningen
 			db.resetResultTable();
@@ -146,6 +137,8 @@
 			Lookup lookup = new Lookup("458x", db, threadPool);
 			lookup.doLookup();								
 		}
+
+		threadPool.shutdown();
 		
 		long now = System.currentTimeMillis();
 		long elapsed = now - start ;
@@ -182,5 +175,14 @@
 		int hours   = (int) ((milliseconds / (1000*60*60)) % 24);
 		
 		return String.format("%02d:%02d:%02d.%03d", hours, minutes, seconds, mseconds);
-	}	
+	}
+	
+	static class WorkerThreadFactory implements ThreadFactory {
+		int count = 0;
+
+		@Override
+		public Thread newThread(Runnable r) {
+			return new Thread(r, "lookupWorker/" + count++);
+		}	
+	}
 }