Nils Weidmann · 0a909f6f · e0134bd7 · e5315a9b · 3305a732
--- a/src/movement/CarMovement.java
+++ b/src/movement/CarMovement.java
 	 * @param nodeDestination
 	 */
 	public void setNextRoute(Coord nodeLocation, Coord nodeDestination) {
-		from = nodeLocation.clone();
-		to = nodeDestination.clone();
+		if (nodeLocation != null) {
+		    from = nodeLocation.clone();
+		}
+		else {
--- a/src/movement/VoluntaryHelperMovement.java
+++ b/src/movement/VoluntaryHelperMovement.java
     * effectively leading to an immediate change to whatever movement model is set directly after calling this method.
     */
    private void setMovementAsForcefullySwitched() {
-        justChanged = true;
+    	if (host.getPath() != null) {
--- a/src/movement/CarMovement.java
+++ b/src/movement/CarMovement.java
 	 * @param nodeDestination
 	 */
 	public void setNextRoute(Coord nodeLocation, Coord nodeDestination) {
--- a/src/core/DTNHost.java
+++ b/src/core/DTNHost.java
        return this.getAddress() - h.getAddress();
    }

+    /**
+     * Sets the host's path (only for JUnit testing!!)
+     * @param p Path to be set
+     */
+    public void setPath(Path p) {
--- a/.metadata/.log 0 → 100644
+++ b/.metadata/.log 0 → 100644
+
+!ENTRY org.eclipse.ui.ide 4 4 2017-05-31 14:07:05.384