diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/AbstractModel.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/AbstractModel.java index 6e4244c3..98771acf 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/AbstractModel.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/AbstractModel.java @@ -90,7 +90,11 @@ public abstract class AbstractModel implements Model { */ protected LinkedList merge(LinkedList child, LinkedList parent, boolean addAtEnd) { if (child == null) { - return parent; + if (parent == null) { + return null; + } else { + return new LinkedList(parent); + } } else if (parent == null) { return child; } else {