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

INT-3871: Fix NPE in the JsonPropertyAccessor

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3871

**Cherry-pick to 4.1.x, 4.0.x, 3.0.x**
This commit is contained in:
Artem Bilan
2015-11-07 20:13:25 -05:00
committed by Gary Russell
parent 1107bfacb4
commit f6b95630c4
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-integration-core/src/main/java/org/springframework/integration/json/JsonPropertyAccessor.java
View File

@@ -18,12 +18,6 @@ package org.springframework.integration.json;
import java.io.IOException;
import org.springframework.expression.AccessException;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.PropertyAccessor;
import org.springframework.expression.TypedValue;
import org.springframework.util.Assert;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -31,6 +25,12 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ContainerNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.springframework.expression.AccessException;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.PropertyAccessor;
import org.springframework.expression.TypedValue;
import org.springframework.util.Assert;
/**
* A SpEL {@link PropertyAccessor} that knows how to read on Jackson JSON objects.
*
@@ -116,7 +116,13 @@ public class JsonPropertyAccessor implements PropertyAccessor {
return new TypedValue(wrap(container.get(index)));
}
else {
return new TypedValue(wrap(container.get(name)));
JsonNode json = container.get(name);
if (json != null) {
return new TypedValue(wrap(json));
}
else {
return null;
}
}
}