[nifi] branch master updated: NIFI-6519 GrokReader does not evaluate EL while validating "Grok Pattern File" property

[aldrin]

This is an automated email from the ASF dual-hosted git repository.

aldrin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new f851a9e  NIFI-6519 GrokReader does not evaluate EL while validating 
"Grok Pattern File" property
f851a9e is described below

commit f851a9e96fa72cb7fe8a5a2bcb177e3e59ec1f61
Author: Ferenc Szabó <szabofe...@apache.org>
AuthorDate: Fri Aug 2 14:03:38 2019 +0200

    NIFI-6519 GrokReader does not evaluate EL while validating "Grok Pattern 
File" property
    
    added evaluateAttributeExpressions call where it was missing.
    
    tested manually
    
    This closes #3627
    
    Signed-off-by: Aldrin Piri <ald...@apache.org>
---
 .../src/main/java/org/apache/nifi/grok/GrokReader.java                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokReader.java
 
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokReader.java
index a462c72..099da2a 100644
--- 
a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokReader.java
+++ 
b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/src/main/java/org/apache/nifi/grok/GrokReader.java
@@ -175,7 +175,7 @@ public class GrokReader extends SchemaRegistryService 
implements RecordReaderFac
                     .build());
         }
 
-        validator = new 
GrokExpressionValidator(validationContext.getProperty(PATTERN_FILE).getValue(),grokCompiler);
+        validator = new 
GrokExpressionValidator(validationContext.getProperty(PATTERN_FILE).evaluateAttributeExpressions().getValue(),grokCompiler);
         results.add(validator.validate(subject,input,validationContext));
         return results;
     }