miscStuffExtended: addressing PR comments #1

haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/HaasOutputObservableValueRegistry.java

@@ -35,11 +35,10 @@ class HaasOutputObservableValueRegistry implements Closeable {
 	public synchronized void close() {
 		if (timer != null) {
 			timer.cancel();
-			timer.purge();
 		}
 	}
 
-	public SimpleObservableValue<String> getObservableOutput(
+	public synchronized SimpleObservableValue<String> getObservableOutput(
 		final SynchronizableFileType type)
 	{
 		return observableValues.get(type);
@@ -60,7 +59,7 @@ class HaasOutputObservableValueRegistry implements Closeable {
 		evaluateTimer();
 	}
 
-	private void evaluateTimer() {
+	private synchronized void evaluateTimer() {
 
 		final boolean anyListeners = numberOfListeners > 0;
 
@@ -69,7 +68,7 @@ class HaasOutputObservableValueRegistry implements Closeable {
 			timer.schedule(new TimerTask() {
 
 				@Override
-				public void run() {
+				public synchronized void run() {
 
 					final List<SynchronizableFileType> types = new LinkedList<>(
 						observableValues.keySet());
@@ -84,7 +83,6 @@ class HaasOutputObservableValueRegistry implements Closeable {
 		}
 		else if (isRunning && !anyListeners) {
 			timer.cancel();
-			timer.purge();
 			isRunning = false;
 		}
 

haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskObservableValueRegistry.java

@@ -24,10 +24,9 @@ class TaskObservableValueRegistry implements Closeable {
 	}
 
 	@Override
-	public void close() {
+	public synchronized void close() {
 		if (timer != null) {
 			timer.cancel();
-			timer.purge();
 		}
 	}
 
@@ -35,7 +34,7 @@ class TaskObservableValueRegistry implements Closeable {
 		return observableTaskList;
 	}
 
-	private void evaluateTimer() {
+	private synchronized void evaluateTimer() {
 
 		final boolean anyListeners = observableTaskList.hasAnyListeners();
 		final CountDownLatch timerLatch = new CountDownLatch(1);
@@ -62,7 +61,6 @@ class TaskObservableValueRegistry implements Closeable {
 		}
 		else if (isRunning && !anyListeners) {
 			timer.cancel();
-			timer.purge();
 			isRunning = false;
 		}