From 3de6f9d35199378244db598b773202f2129c09cd Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <ntd@informatik.uni-kiel.de>
Date: Fri, 27 Mar 2015 12:22:22 +0100
Subject: [PATCH] merger propagates startingsignal already on first appearance
---
src/main/java/teetime/stage/basic/merger/Merger.java | 3 ++-
src/site/markdown/wiki | 2 +-
2 files changed, 3 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 d8b0320a..adeb4abb 100644
--- a/src/main/java/teetime/stage/basic/merger/Merger.java
+++ b/src/main/java/teetime/stage/basic/merger/Merger.java
@@ -24,6 +24,7 @@ import teetime.framework.AbstractStage;
import teetime.framework.InputPort;
import teetime.framework.OutputPort;
import teetime.framework.signal.ISignal;
+import teetime.framework.signal.StartingSignal;
/**
*
@@ -94,7 +95,7 @@ public final class Merger<T> extends AbstractStage {
signalMap.put((Class<ISignal>) signalClass, tempSet);
}
- if (signalMap.get(signalClass).size() == this.getInputPorts().length) {
+ if (signalMap.get(signalClass).size() == this.getInputPorts().length || signalClass == StartingSignal.class) {
signal.trigger(this);
this.outputPort.sendSignal(signal);
signalMap.remove(signalClass);
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index 0e447457..63ccbbc8 160000
--- a/src/site/markdown/wiki
+++ b/src/site/markdown/wiki
@@ -1 +1 @@
-Subproject commit 0e4474577e1f49bc96e734c286b2d9e0363895e8
+Subproject commit 63ccbbc87bd2c0e6599ca91502149dba3cfb99de
--
GitLab