From 5fbbe50667151885ed0ff86e54fe60f06b1113c3 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 4 Oct 2014 23:58:46 +0200 Subject: [PATCH] [Bugfix] fix NPE when cloning Resources with no state vars --- .../src/main/java/li/strolch/model/Resource.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/li.strolch.model/src/main/java/li/strolch/model/Resource.java b/li.strolch.model/src/main/java/li/strolch/model/Resource.java index b5a4ec006..db4886fdd 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/Resource.java +++ b/li.strolch.model/src/main/java/li/strolch/model/Resource.java @@ -172,8 +172,10 @@ public class Resource extends GroupedParameterizedElement implements StrolchRoot super.fillClone(clone); - for (StrolchTimedState> timedState : this.timedStateMap.values()) { - clone.addTimedState(timedState.getClone()); + if (this.timedStateMap != null) { + for (StrolchTimedState> timedState : this.timedStateMap.values()) { + clone.addTimedState(timedState.getClone()); + } } return clone;