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

null check bug

Browse Source
This commit is contained in:
Keith Donald
2008-03-05 01:15:00 +00:00
parent 6e821b08a4
commit 8f3dd2acf7
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-webflow/src/main/java/org/springframework/webflow/action/ActionResultExposer.java
View File

@@ -57,12 +57,12 @@ public class ActionResultExposer implements Serializable {
public ActionResultExposer(Expression resultExpression, Class expectedResultType,
ConversionService conversionService) {
Assert.notNull(resultExpression, "The result expression is required");
if (expectedResultType != null) {
Assert.notNull(conversionService, "A conversionService is required with an expectedResultType");
}
this.resultExpression = resultExpression;
this.expectedResultType = expectedResultType;
if (this.expectedResultType != null) {
Assert.notNull(conversionService, "A conversionService is required with an expectedResultType");
this.conversionService = conversionService;
}
this.conversionService = conversionService;
}
/**
@@ -93,10 +93,11 @@ public class ActionResultExposer implements Serializable {
* @param value the raw value to be converted
*/
private Object applyTypeConversion(Object value) {
if (expectedResultType == null) {
if (value == null || expectedResultType == null) {
return value;
} else {
return conversionService.getConversionExecutor(value.getClass(), expectedResultType).execute(value);
}
return conversionService.getConversionExecutor(value.getClass(), expectedResultType).execute(value);
}
public String toString() {

10
spring-webflow/src/test/java/org/springframework/webflow/action/ActionResultExposerTests.java
View File

@@ -8,7 +8,7 @@ import org.springframework.webflow.test.MockRequestContext;
public class ActionResultExposerTests extends TestCase {
public void testEvaluateExpressionNullResult() throws Exception {
public void testEvaluateExpressionResult() throws Exception {
StaticExpression resultExpression = new StaticExpression("");
ActionResultExposer exposer = new ActionResultExposer(resultExpression, null, null);
MockRequestContext context = new MockRequestContext();
@@ -16,6 +16,14 @@ public class ActionResultExposerTests extends TestCase {
assertEquals("foo", resultExpression.getValue(null));
}
public void testEvaluateExpressionNullResult() throws Exception {
StaticExpression resultExpression = new StaticExpression("");
ActionResultExposer exposer = new ActionResultExposer(resultExpression, null, null);
MockRequestContext context = new MockRequestContext();
exposer.exposeResult(null, context);
assertEquals(null, resultExpression.getValue(null));
}
public void testEvaluateExpressionResultExposerWithTypeConversion() throws Exception {
StaticExpression resultExpression = new StaticExpression("");
ActionResultExposer exposer = new ActionResultExposer(resultExpression, Integer.class,