Repository: nifi
Updated Branches:
  refs/heads/master 3966f5ce8 -> 80dfe0257


ExtractGrok - Include exception message when compile fails

This closes: #1845

Signed-off-by: Andre F de Miranda <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/80dfe025
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/80dfe025
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/80dfe025

Branch: refs/heads/master
Commit: 80dfe0257ffbafe45e6d49433405f5be1214401e
Parents: 3966f5c
Author: Pierre Villard <[email protected]>
Authored: Tue May 23 20:27:22 2017 +0200
Committer: Andre F de Miranda <[email protected]>
Committed: Sat May 27 00:56:25 2017 +1000

----------------------------------------------------------------------
 .../org/apache/nifi/processors/standard/ExtractGrok.java | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/80dfe025/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
index 2790dc9..6b56638 100644
--- 
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
+++ 
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExtractGrok.java
@@ -255,19 +255,12 @@ public class ExtractGrok extends AbstractProcessor {
                 Grok grok = new Grok();
                 try {
                     grok.compile(input);
-                } catch (GrokException e) {
+                } catch (GrokException | 
java.util.regex.PatternSyntaxException e) {
                     return new ValidationResult.Builder()
                             .subject(subject)
                             .input(input)
                             .valid(false)
-                            .explanation("Not a valid Grok Expression")
-                            .build();
-                } catch (java.util.regex.PatternSyntaxException e) {
-                    return new ValidationResult.Builder()
-                            .subject(subject)
-                            .input(input)
-                            .valid(false)
-                            .explanation("Not a valid Grok Expression")
+                            .explanation("Not a valid Grok Expression - " + 
e.getMessage())
                             .build();
                 }
 

Reply via email to