--- 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/11 16:44:04 2208 @@ -29,7 +29,7 @@ int postnr; Database db; - ArrayList daekkedeAdresser; + Adresse daekkedeAdresser[]; Queue queue; Map workers = new ConcurrentHashMap(); @@ -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 getDaekkedeAdresser() { + public Adresse[] getDaekkedeAdresser() { return daekkedeAdresser; } @@ -226,9 +231,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) );*/ } }