--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/LookupWorker.java 2016/01/30 19:20:43 2885
+++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/afstandandenrute/LookupWorker.java 2016/01/31 22:45:03 2891
@@ -34,6 +34,7 @@
Constants consts;
AtomicInteger antalFundne;
+ AtomicInteger antalBeregnet;
int workerID;
boolean verbose;
@@ -48,6 +49,7 @@
Queue
ikkeDaekkede,
Map> hoTrees,
AtomicInteger antalFundne,
+ AtomicInteger antalBeregnet,
Database db,
boolean verbose,
Constants consts) {
@@ -58,6 +60,7 @@
this.ikkeDaekkede = ikkeDaekkede;
this.hoTrees = hoTrees;
this.antalFundne = antalFundne;
+ this.antalBeregnet = antalBeregnet;
this.db = db;
this.verbose = verbose;
this.consts = consts;
@@ -90,7 +93,7 @@
int size = res.size();
if (size > MAX_RESULTS ) {
System.out.println("Returnerede mere end MAX_RESULTS> " + res.size() );
- System.exit(0);
+ throw new Exception("Returnerede mere end MAX_RESULTS> " + res.size());
}
ArrayList adrList = new ArrayList();
@@ -142,7 +145,8 @@
System.out.println("For stor afstand: " + qAddress + " > " + bedsteAfstand);
}
}
-
+
+ antalBeregnet.incrementAndGet();
}
} catch (Exception e) {
@@ -155,14 +159,10 @@
try {
logger.info( "Worker/" + workerID + " afventer barrier");
barrier.await();
- } catch (BrokenBarrierException e) {
- logger.log(Level.SEVERE, e.getMessage(), e);
- System.exit(-1);
- } catch(InterruptedException e) {
+ } catch (Exception e) {
logger.log(Level.SEVERE, e.getMessage(), e);
}
-
System.out.println( "Worker/" + workerID + " stopping");
}