Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

null binder element npe

Browse Source
This commit is contained in:
Keith Donald
2008-09-16 19:42:32 +00:00
parent 8dc8537171
commit 24bb3a894e
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spring-webflow/src/main/java/org/springframework/webflow/engine/builder/model/FlowModelFlowBuilder.java
View File

@@ -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) {

7
spring-webflow/src/main/java/org/springframework/webflow/engine/model/BinderModel.java
View File

@@ -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;
}