You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/07/08 03:08:49 UTC
[1/2] incubator-nifi git commit: NIFI-753: when truncating value,
take null values into account
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 <ma...@hotmail.com>
Authored: Tue Jul 7 20:44:03 2015 -0400
Committer: Mark Payne <ma...@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);
}
[2/2] incubator-nifi git commit: Merge branch 'develop' of
http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3125036d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3125036d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3125036d
Branch: refs/heads/develop
Commit: 3125036d3f463c97a10466d244952f10f0054b64
Parents: c0f1104 9fa03b4
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Jul 7 21:08:34 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Jul 7 21:08:34 2015 -0400
----------------------------------------------------------------------
nifi/nifi-external/nifi-storm-spout/pom.xml | 2 +-
.../java/org/apache/nifi/storm/NiFiSpout.java | 38 ++++++++++++++++++--
.../ConfigurableComponentInitializer.java | 9 ++++-
.../apache/nifi/documentation/DocGenerator.java | 2 ++
.../init/ControllerServiceInitializer.java | 11 ++++--
.../init/ProcessorInitializer.java | 11 ++++--
.../init/ReportingTaskingInitializer.java | 11 ++++--
.../html/HtmlDocumentationWriterTest.java | 10 +++---
.../html/ProcessorDocumentationWriterTest.java | 7 ++--
9 files changed, 82 insertions(+), 19 deletions(-)
----------------------------------------------------------------------