From c5068157c67997210429beee5ae54b715d954d41 Mon Sep 17 00:00:00 2001 From: Jeremy Dyer Date: Wed, 6 Jan 2016 14:17:55 -0500 Subject: [PATCH] NIFI-1360 --- .../org/apache/nifi/processors/standard/MergeContent.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java index 89eea85fda46..7190dcca915c 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java @@ -238,6 +238,7 @@ public class MergeContent extends BinFiles { .description("If specified, like FlowFiles will be binned together, where 'like FlowFiles' means FlowFiles that have the same value for " + "this Attribute. If not specified, FlowFiles are bundled by the order in which they are pulled from the queue.") .required(false) + .expressionLanguageSupported(true) .addValidator(StandardValidators.ATTRIBUTE_KEY_VALIDATOR) .defaultValue(null) .build(); @@ -376,7 +377,8 @@ protected FlowFile preprocessFlowFile(final ProcessContext context, final Proces @Override protected String getGroupId(final ProcessContext context, final FlowFile flowFile) { - final String correlationAttributeName = context.getProperty(CORRELATION_ATTRIBUTE_NAME).getValue(); + final String correlationAttributeName = context.getProperty(CORRELATION_ATTRIBUTE_NAME) + .evaluateAttributeExpressions().getValue(); String groupId = correlationAttributeName == null ? null : flowFile.getAttribute(correlationAttributeName); // when MERGE_STRATEGY is Defragment and correlationAttributeName is null then bin by fragment.identifier