You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by da...@apache.org on 2015/06/27 02:29:59 UTC
[32/50] [abbrv] incubator-nifi git commit: NIFI-711: Do not check
status of FlowFile when emitting provenance CLONE event during session
commit/checkpoint
NIFI-711: Do not check status of FlowFile when emitting provenance CLONE event during session commit/checkpoint
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b22a1261
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b22a1261
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b22a1261
Branch: refs/heads/NIFI-680
Commit: b22a1261c3f29c8714d043174b7beff36ebe5549
Parents: 77a0561
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Jun 22 11:31:55 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Jun 22 13:30:53 2015 -0400
----------------------------------------------------------------------
.../nifi/controller/repository/StandardProcessSession.java | 2 +-
.../controller/repository/StandardProvenanceReporter.java | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b22a1261/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index 4ee8c06..04e819e 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -260,7 +260,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
final FlowFileRecord clone = builder.build();
final StandardRepositoryRecord newRecord = new StandardRepositoryRecord(destination.getFlowFileQueue());
- getProvenanceReporter().clone(currRec, clone);
+ provenanceReporter.clone(currRec, clone, false);
final ContentClaim claim = clone.getContentClaim();
if (claim != null) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/b22a1261/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProvenanceReporter.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProvenanceReporter.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProvenanceReporter.java
index 5194fef..8852f42 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProvenanceReporter.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProvenanceReporter.java
@@ -327,7 +327,13 @@ public class StandardProvenanceReporter implements ProvenanceReporter {
@Override
public void clone(final FlowFile parent, final FlowFile child) {
- verifyFlowFileKnown(child);
+ clone(parent, child, true);
+ }
+
+ void clone(final FlowFile parent, final FlowFile child, final boolean verifyFlowFile) {
+ if (verifyFlowFile) {
+ verifyFlowFileKnown(child);
+ }
try {
final ProvenanceEventBuilder eventBuilder = build(parent, ProvenanceEventType.CLONE);