You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2018/01/19 16:26:26 UTC
nifi git commit: NIFI-1604 - PutSolrContentStream - Evaluate stream
path against flow file
Repository: nifi
Updated Branches:
refs/heads/master 4b3b2ebf2 -> a3ddb3b4f
NIFI-1604 - PutSolrContentStream - Evaluate stream path against flow file
This closes #2092.
Signed-off-by: Bryan Bende <bb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a3ddb3b4
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a3ddb3b4
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a3ddb3b4
Branch: refs/heads/master
Commit: a3ddb3b4fae69c4d841caa8c5d6d342ef94a9884
Parents: 4b3b2eb
Author: Pierre Villard <pi...@gmail.com>
Authored: Wed Aug 16 17:12:16 2017 +0200
Committer: Bryan Bende <bb...@apache.org>
Committed: Fri Jan 19 11:26:05 2018 -0500
----------------------------------------------------------------------
.../org/apache/nifi/processors/solr/PutSolrContentStream.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/a3ddb3b4/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
index 69bc071..4a16953 100755
--- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
+++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/src/main/java/org/apache/nifi/processors/solr/PutSolrContentStream.java
@@ -192,16 +192,13 @@ public class PutSolrContentStream extends SolrProcessor {
final boolean isSolrCloud = SOLR_TYPE_CLOUD.equals(context.getProperty(SOLR_TYPE).getValue());
final String collection = context.getProperty(COLLECTION).evaluateAttributeExpressions(flowFile).getValue();
final Long commitWithin = context.getProperty(COMMIT_WITHIN).evaluateAttributeExpressions(flowFile).asLong();
-
+ final String contentStreamPath = context.getProperty(CONTENT_STREAM_PATH).evaluateAttributeExpressions(flowFile).getValue();
final MultiMapSolrParams requestParams = new MultiMapSolrParams(getRequestParams(context, flowFile));
StopWatch timer = new StopWatch(true);
session.read(flowFile, new InputStreamCallback() {
@Override
public void process(final InputStream in) throws IOException {
- final String contentStreamPath = context.getProperty(CONTENT_STREAM_PATH)
- .evaluateAttributeExpressions().getValue();
-
ContentStreamUpdateRequest request = new ContentStreamUpdateRequest(contentStreamPath);
request.setParams(new ModifiableSolrParams());