From 522806eaab03cdf2aae2b4040f611b2164449230 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <ntd@informatik.uni-kiel.de>
Date: Tue, 17 Feb 2015 17:14:03 +0100
Subject: [PATCH] merger terminated too early; test still not working 100%
---
src/main/java/teetime/stage/basic/merger/Merger.java | 2 +-
src/test/java/teetime/stage/WordCountingTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/teetime/stage/basic/merger/Merger.java b/src/main/java/teetime/stage/basic/merger/Merger.java
index 10c5f4f2..289c1ca8 100644
--- a/src/main/java/teetime/stage/basic/merger/Merger.java
+++ b/src/main/java/teetime/stage/basic/merger/Merger.java
@@ -85,11 +85,11 @@ public final class Merger<T> extends AbstractStage {
}
if (set.size() == this.getInputPorts().length) {
+ signal.trigger(this);
this.outputPort.sendSignal(signal);
signalMap.remove(signal.getClass());
}
} else {
- signal.trigger(this);
Set<InputPort<?>> tempSet = new HashSet<InputPort<?>>();
tempSet.add(inputPort);
signalMap.put(signal.getClass(), tempSet);
diff --git a/src/test/java/teetime/stage/WordCountingTest.java b/src/test/java/teetime/stage/WordCountingTest.java
index 1d2da4ef..72798f40 100644
--- a/src/test/java/teetime/stage/WordCountingTest.java
+++ b/src/test/java/teetime/stage/WordCountingTest.java
@@ -12,7 +12,7 @@ public class WordCountingTest {
@Test
public void test1() {
- WordCountingConfiguration wcc = new WordCountingConfiguration(2, new File("src/test/resources/data/output.txt"), new File(
+ WordCountingConfiguration wcc = new WordCountingConfiguration(1, new File("src/test/resources/data/output.txt"), new File(
"src/test/resources/data/output.txt"));
Analysis analysis = new Analysis(wcc);
analysis.start();
--
GitLab