From 301722dbb2c8affabc95f59c4cc3384bd498f673 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Tue, 7 Apr 2009 22:44:11 +0000
Subject: [PATCH] return new parent copy in merge

---
 .../springframework/webflow/engine/model/AbstractModel.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 {