You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ij...@apache.org on 2017/01/19 02:18:06 UTC
nifi git commit: NIFI-1962 - Fixed NPE in toDate() EL function
Repository: nifi
Updated Branches:
refs/heads/master bbc714e73 -> 7a2751bf5
NIFI-1962 - Fixed NPE in toDate() EL function
This closes #1409.
Signed-off-by: Koji Kawamura <ij...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/7a2751bf
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/7a2751bf
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/7a2751bf
Branch: refs/heads/master
Commit: 7a2751bf5d5ee7b6c988a14f75d769a67b9b80cf
Parents: bbc714e
Author: Pierre Villard <pi...@gmail.com>
Authored: Wed Jan 11 02:12:07 2017 +0100
Committer: Koji Kawamura <ij...@apache.org>
Committed: Thu Jan 19 11:16:30 2017 +0900
----------------------------------------------------------------------
.../language/evaluation/functions/NumberToDateEvaluator.java | 2 +-
.../org/apache/nifi/attribute/expression/language/TestQuery.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/7a2751bf/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java
index 6867202..c4b14bb 100644
--- a/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java
+++ b/nifi-commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/functions/NumberToDateEvaluator.java
@@ -37,7 +37,7 @@ public class NumberToDateEvaluator extends DateEvaluator {
final QueryResult<Long> result = subject.evaluate(attributes);
final Long value = result.getValue();
if (value == null) {
- return null;
+ return new DateQueryResult(null);
}
return new DateQueryResult(new Date(value));
http://git-wip-us.apache.org/repos/asf/nifi/blob/7a2751bf/nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
----------------------------------------------------------------------
diff --git a/nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java b/nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
index 03de38f..5946aa5 100644
--- a/nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
+++ b/nifi-commons/nifi-expression-language/src/test/java/org/apache/nifi/attribute/expression/language/TestQuery.java
@@ -898,6 +898,9 @@ public class TestQuery {
verifyEquals("${entryDate:toNumber():toDate():format('yyyy')}", attributes, String.valueOf(year));
+ // test for not existing attribute (NIFI-1962)
+ assertEquals("", Query.evaluateExpressions("${notExistingAtt:toDate()}", attributes, null));
+
attributes.clear();
attributes.put("month", "3");
attributes.put("day", "4");