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/29 23:02:21 UTC
[4/4] nifi git commit: Merge branch 'NIFI-744' of
https://git-wip-us.apache.org/repos/asf/nifi into NIFI-744
Merge branch 'NIFI-744' of https://git-wip-us.apache.org/repos/asf/nifi into NIFI-744
Conflicts:
nifi/nifi-api/src/main/java/org/apache/nifi/controller/repository/claim/ContentClaim.java
nifi/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/stream/io/ByteCountingOutputStream.java
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/301078be
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/301078be
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/301078be
Branch: refs/heads/NIFI-744
Commit: 301078bec69c900dc7bfde460bb0a3ca50a98220
Parents: 9f32074 50379fc
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Jul 29 16:33:29 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Jul 29 17:01:56 2015 -0400
----------------------------------------------------------------------
.../apache/nifi/controller/repository/StandardProcessSession.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/301078be/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
----------------------------------------------------------------------
diff --cc nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index c245424,2ce48fa..3e2868e
--- 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
@@@ -2200,7 -2241,10 +2200,7 @@@ public final class StandardProcessSessi
if (newClaim != null) {
destroyContent(newClaim);
}
-
++
throw new FlowFileAccessException("Failed to import data from " + source + " for " + destination + " due to " + t.toString(), t);
}