NIFI-333 catching ProcessException instead of Exception for HDFS helper classes
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3629d244 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3629d244 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3629d244 Branch: refs/heads/NIFI-250 Commit: 3629d2441bace2a3221fa59c549eea1e6aabb786 Parents: 342ca17 Author: danbress <[email protected]> Authored: Sun Mar 8 11:12:47 2015 -0400 Committer: danbress <[email protected]> Committed: Sun Mar 8 11:12:47 2015 -0400 ---------------------------------------------------------------------- .../nifi/processors/hadoop/KeyValueReader.java | 16 ++++++++-------- .../apache/nifi/processors/hadoop/ValueReader.java | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3629d244/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java index d7a679f..40ef5fa 100644 --- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java +++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/KeyValueReader.java @@ -24,13 +24,6 @@ import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; -import org.apache.nifi.flowfile.FlowFile; -import org.apache.nifi.flowfile.attributes.CoreAttributes; -import org.apache.nifi.processor.ProcessSession; -import org.apache.nifi.processor.io.OutputStreamCallback; -import org.apache.nifi.processors.hadoop.util.OutputStreamWritable; -import org.apache.nifi.processors.hadoop.util.SequenceFileReader; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; @@ -39,6 +32,13 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.SequenceFile.Reader; import org.apache.hadoop.io.Text; +import org.apache.nifi.flowfile.FlowFile; +import org.apache.nifi.flowfile.attributes.CoreAttributes; +import org.apache.nifi.processor.ProcessSession; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.io.OutputStreamCallback; +import org.apache.nifi.processors.hadoop.util.OutputStreamWritable; +import org.apache.nifi.processors.hadoop.util.SequenceFileReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,7 +90,7 @@ public class KeyValueReader implements SequenceFileReader<Set<FlowFile>> { try { flowFile = session.write(flowFile, callback); flowFiles.add(flowFile); - } catch (Exception e) { + } catch (ProcessException e) { LOG.error("Could not write to flowfile {}", new Object[]{flowFile}, e); session.remove(flowFile); } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/3629d244/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ValueReader.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ValueReader.java b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ValueReader.java index 0fa0307..e334582 100644 --- a/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ValueReader.java +++ b/nifi/nifi-nar-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/ValueReader.java @@ -23,13 +23,6 @@ import java.util.HashSet; import java.util.Set; import java.util.regex.Pattern; -import org.apache.nifi.flowfile.FlowFile; -import org.apache.nifi.flowfile.attributes.CoreAttributes; -import org.apache.nifi.processor.ProcessSession; -import org.apache.nifi.processor.io.OutputStreamCallback; -import org.apache.nifi.processors.hadoop.util.OutputStreamWritable; -import org.apache.nifi.processors.hadoop.util.SequenceFileReader; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; @@ -38,6 +31,13 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.SequenceFile; import org.apache.hadoop.io.SequenceFile.Reader; import org.apache.hadoop.io.Text; +import org.apache.nifi.flowfile.FlowFile; +import org.apache.nifi.flowfile.attributes.CoreAttributes; +import org.apache.nifi.processor.ProcessSession; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.io.OutputStreamCallback; +import org.apache.nifi.processors.hadoop.util.OutputStreamWritable; +import org.apache.nifi.processors.hadoop.util.SequenceFileReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -85,7 +85,7 @@ public class ValueReader implements SequenceFileReader<Set<FlowFile>> { try { flowFile = session.write(flowFile, writer); flowFiles.add(flowFile); - } catch (Exception e) { + } catch (ProcessException e) { LOG.error("Could not write to flowfile {}", new Object[]{flowFile}, e); session.remove(flowFile); }
