--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/09/11 10:35:55	2202
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/09/12 06:42:29	2214
@@ -2,14 +2,14 @@
 
 import java.io.File;
 import java.io.FileReader;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
 
 import dk.daoas.fulddaekning.BoundingBox.BoundingBoxException;
 
@@ -29,7 +29,7 @@
 	int postnr;
 	Database db;
 		
-	ArrayList<Adresse> daekkedeAdresser;
+	Adresse daekkedeAdresser[];
 	Queue<Adresse> queue;
 	
 	Map<Integer, LookupWorker> workers = new ConcurrentHashMap<Integer, LookupWorker>();
@@ -88,7 +88,7 @@
 			queue = db.hentIkkedaekkedeAdresser(postnr);
 			
 			stat.postnr = postnr;
-			stat.antalDaekkede = daekkedeAdresser.size();
+			stat.antalDaekkede = daekkedeAdresser.length;
 			stat.antalIkkeDaekkede = queue.size();
 			
 			saveStatistics(stat);
@@ -128,7 +128,12 @@
 	
 	public void shutdownWorker(int workerid) {
 		logger.info("Shutting down worker: " + workerid);
-		workers.remove(workerid);
+		LookupWorker key = workers.remove(workerid);
+		
+		if (key == null) {
+			System.out.println("Error removing worker from set");
+			System.exit(0);
+		}
 	}
 	
 	// Getters and setters
@@ -140,7 +145,7 @@
 
 
 
-	public ArrayList<Adresse> getDaekkedeAdresser() {
+	public Adresse[] getDaekkedeAdresser() {
 		return daekkedeAdresser;
 	}
 
@@ -161,6 +166,16 @@
 	
 	public static void main(String[] args) throws Exception {
 		
+		//Setup j.u.l Logger
+		Logger root = Logger.getLogger("");
+		FileHandler fhandler = new FileHandler("fulddaekning.log"); // Ingen max størrelse, ingen rotation og ingen append
+		fhandler.setFormatter( new SimpleFormatter() );
+		root.addHandler( fhandler );
+		
+		
+		
+		
+		
 		File confFile = new File( CONFIG_FILENAME );
 		if (! confFile.exists() ) {
 			logger.warning("Config file not found: " + CONFIG_FILENAME);
@@ -226,9 +241,13 @@
 		logger.info("Fuld load done : " + (now-start) );
 
 		
-		
-		//Lookup lookup = new Lookup(7400, db);
-		//lookup.doLookup();		
+		/*
+		/// Test
+		db.resetResultTable();
+		Lookup lookup = new Lookup(2750, db);
+		lookup.doLookup();		
+		long now = System.currentTimeMillis();
+		logger.info("Fuld load done : " + (now-start) );*/
 	}
 		
 }