Repository: incubator-nifi Updated Branches: refs/heads/develop 9fa03b432 -> 3125036d3
NIFI-753: when truncating value, take null values into account Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c0f11046 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c0f11046 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c0f11046 Branch: refs/heads/develop Commit: c0f110467997d1e05e58ef444385478ba05a59e5 Parents: 2084024 Author: Mark Payne <marka...@hotmail.com> Authored: Tue Jul 7 20:44:03 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Tue Jul 7 20:44:03 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/provenance/StandardRecordReader.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c0f11046/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordReader.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordReader.java b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordReader.java index 0939107..5221ebc 100644 --- a/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordReader.java +++ b/nifi/nifi-nar-bundles/nifi-provenance-repository-bundle/nifi-persistent-provenance-repository/src/main/java/org/apache/nifi/provenance/StandardRecordReader.java @@ -369,7 +369,15 @@ public class StandardRecordReader implements RecordReader { for (int i = 0; i < numAttributes; i++) { final String key = readLongString(dis); final String value = valueNullable ? readLongNullableString(dis) : readLongString(dis); - final String truncatedValue = value.length() > maxAttributeChars ? value.substring(0, maxAttributeChars) : value; + final String truncatedValue; + if (value == null) { + truncatedValue = null; + } else if (value.length() > maxAttributeChars) { + truncatedValue = value.substring(0, maxAttributeChars); + } else { + truncatedValue = value; + } + attrs.put(key, truncatedValue); }
