From 28d00d4b4358016b20a78f4e5792b2bd1b409faf Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Mon, 22 Jun 2015 16:25:07 +0200
Subject: [PATCH] minor refactorings; added null checks

---
 .../framework/AbstractCompositeStage.java     |  3 ++
 .../framework/ConfigurationContext.java       |  6 ++--
 .../framework/pipe/InstantiationPipe.java     | 33 ++++++++++---------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/main/java/teetime/framework/AbstractCompositeStage.java b/src/main/java/teetime/framework/AbstractCompositeStage.java
index 2a9f0e79..59b8a5ef 100644
--- a/src/main/java/teetime/framework/AbstractCompositeStage.java
+++ b/src/main/java/teetime/framework/AbstractCompositeStage.java
@@ -28,6 +28,9 @@ public abstract class AbstractCompositeStage extends Configuration {
 	private final ConfigurationContext context;
 
 	public AbstractCompositeStage(final ConfigurationContext context) {
+		if (null == context) {
+			throw new IllegalArgumentException("Context may not be null.");
+		}
 		this.context = context;
 	}
 
diff --git a/src/main/java/teetime/framework/ConfigurationContext.java b/src/main/java/teetime/framework/ConfigurationContext.java
index a9acaeba..4e2f5f6a 100644
--- a/src/main/java/teetime/framework/ConfigurationContext.java
+++ b/src/main/java/teetime/framework/ConfigurationContext.java
@@ -202,9 +202,9 @@ public abstract class ConfigurationContext extends Configuration {
 		if (sourcePort.getOwningStage().getInputPorts().length == 0 && !threadableStages.contains(sourcePort.getOwningStage())) {
 			addThreadableStage(sourcePort.getOwningStage());
 		}
-		if (sourcePort.pipe != null) {
-			LOGGER.warn("Overwritting existing pipe while connecting stages " + sourcePort.getOwningStage().getId() + " and " + targetPort.getOwningStage().getId()
-					+ ".");
+		if (sourcePort.getPipe() != null || targetPort.getPipe() != null) {
+			LOGGER.warn("Overwriting existing pipe while connecting stages " +
+					sourcePort.getOwningStage().getId() + " and " + targetPort.getOwningStage().getId() + ".");
 		}
 		new InstantiationPipe(sourcePort, targetPort, capacity);
 	}
diff --git a/src/main/java/teetime/framework/pipe/InstantiationPipe.java b/src/main/java/teetime/framework/pipe/InstantiationPipe.java
index 64e6dbf2..b922f15e 100644
--- a/src/main/java/teetime/framework/pipe/InstantiationPipe.java
+++ b/src/main/java/teetime/framework/pipe/InstantiationPipe.java
@@ -21,13 +21,16 @@ import teetime.framework.signal.ISignal;
 
 public class InstantiationPipe implements IPipe {
 
-	private final InputPort<?> target;
+	private static final String ERROR_MESSAGE = "This must not be called while executing the configuration";
+
+	private final InputPort<?> targetPort;
 	private final int capacity;
 
 	public <T> InstantiationPipe(final OutputPort<? extends T> sourcePort, final InputPort<T> targetPort, final int capacity) {
-		this.target = targetPort;
+		this.targetPort = targetPort;
 		this.capacity = capacity;
 		sourcePort.setPipe(this);
+		targetPort.setPipe(this);
 	}
 
 	public int getCapacity() {
@@ -36,67 +39,67 @@ public class InstantiationPipe implements IPipe {
 
 	@Override
 	public InputPort<?> getTargetPort() {
-		return this.target;
+		return this.targetPort;
 	}
 
 	@Override
 	public boolean add(final Object element) {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 	@Override
 	public boolean addNonBlocking(final Object element) {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 	@Override
 	public boolean isEmpty() {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 	@Override
 	public int size() {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 	@Override
 	public Object removeLast() {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 	@Override
 	public void sendSignal(final ISignal signal) {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 	@Override
 	public void reportNewElement() {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 	@Override
 	public boolean isClosed() {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 	@Override
 	public boolean hasMore() {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 	@Override
 	public void waitForStartSignal() throws InterruptedException {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 	@Override
 	public void waitForInitializingSignal() throws InterruptedException {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 	@Override
 	public void close() {
-		throw new IllegalStateException("This must not be called while executing the configuration");
+		throw new IllegalStateException(ERROR_MESSAGE);
 	}
 
 }
-- 
GitLab