From 24bb3a894eab11c0ac91e400db149235fdbf9bee Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Tue, 16 Sep 2008 19:42:32 +0000
Subject: [PATCH] null binder element npe

---
 .../builder/model/FlowModelFlowBuilder.java   | 32 ++++++++++---------
 .../webflow/engine/model/BinderModel.java     |  7 ----
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java
index 379ed1fe..ba4878ee 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java
@@ -628,23 +628,25 @@ public class FlowModelFlowBuilder extends AbstractFlowBuilder {
 	}
 
 	private BinderConfiguration createBinderConfiguration(BinderModel binderModel) {
-		if (binderModel == null) {
+		if (binderModel != null && binderModel.getBindings() != null) {
+			BinderConfiguration binderConfiguration = new BinderConfiguration();
+			List bindings = binderModel.getBindings();
+			for (Iterator it = bindings.iterator(); it.hasNext();) {
+				BindingModel bindingModel = (BindingModel) it.next();
+				boolean required;
+				if (StringUtils.hasText(bindingModel.getRequired())) {
+					required = ((Boolean) fromStringTo(Boolean.class).execute(bindingModel.getRequired()))
+							.booleanValue();
+				} else {
+					required = false;
+				}
+				Binding binding = new Binding(bindingModel.getProperty(), bindingModel.getConverter(), required);
+				binderConfiguration.addBinding(binding);
+			}
+			return binderConfiguration;
+		} else {
 			return null;
 		}
-		BinderConfiguration binderConfiguration = new BinderConfiguration();
-		List bindings = binderModel.getBindings();
-		for (Iterator it = bindings.iterator(); it.hasNext();) {
-			BindingModel bindingModel = (BindingModel) it.next();
-			boolean required;
-			if (StringUtils.hasText(bindingModel.getRequired())) {
-				required = ((Boolean) fromStringTo(Boolean.class).execute(bindingModel.getRequired())).booleanValue();
-			} else {
-				required = false;
-			}
-			Binding binding = new Binding(bindingModel.getProperty(), bindingModel.getConverter(), required);
-			binderConfiguration.addBinding(binding);
-		}
-		return binderConfiguration;
 	}
 
 	private ViewVariable[] parseViewVariables(List vars) {
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/BinderModel.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/BinderModel.java
index 0054ef9d..9c8c3e8b 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/BinderModel.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/BinderModel.java
@@ -25,13 +25,6 @@ public class BinderModel extends AbstractModel {
 
 	private LinkedList bindings;
 
-	public void addBinding(BindingModel bindingModel) {
-		if (bindings == null) {
-			bindings = new LinkedList();
-		}
-		bindings.add(bindingModel);
-	}
-
 	public LinkedList getBindings() {
 		return bindings;
 	}