Repository: incubator-pirk Updated Branches: refs/heads/master 6d70c969f -> ed953852f
[PIRK-43]: Catch FileNotFoundException in Data/Query Schema Loaders -- closes apache/incubator-pirk#45 Project: http://git-wip-us.apache.org/repos/asf/incubator-pirk/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-pirk/commit/ed953852 Tree: http://git-wip-us.apache.org/repos/asf/incubator-pirk/tree/ed953852 Diff: http://git-wip-us.apache.org/repos/asf/incubator-pirk/diff/ed953852 Branch: refs/heads/master Commit: ed953852ff9695cca83f5af25c2d3d9f7a4e779e Parents: 6d70c96 Author: eawilliams <[email protected]> Authored: Fri Aug 5 19:26:45 2016 -0400 Committer: eawilliams <[email protected]> Committed: Fri Aug 5 19:26:45 2016 -0400 ---------------------------------------------------------------------- .../pirk/schema/data/DataSchemaLoader.java | 28 +++++++++++++------- .../pirk/schema/query/QuerySchemaLoader.java | 28 +++++++++++++------- 2 files changed, 38 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/ed953852/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java b/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java index 44f99b7..42f898d 100644 --- a/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java +++ b/src/main/java/org/apache/pirk/schema/data/DataSchemaLoader.java @@ -19,6 +19,7 @@ package org.apache.pirk.schema.data; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; @@ -108,7 +109,7 @@ public class DataSchemaLoader // Parse and load the schema file into a DataSchema object; place in the schemaMap DataSchemaLoader loader = new DataSchemaLoader(); - InputStream is; + InputStream is = null; if (hdfs) { is = fs.open(new Path(schemaFile)); @@ -116,17 +117,26 @@ public class DataSchemaLoader } else { - is = new FileInputStream(schemaFile); - logger.info("localFS: inputFile = " + schemaFile); + try + { + is = new FileInputStream(schemaFile); + logger.info("localFS: inputFile = " + schemaFile); + } catch (FileNotFoundException e) + { + logger.info("localFS: inputFile = " + schemaFile + " not found"); + } } - try + if (is != null) { - DataSchema dataSchema = loader.loadSchema(is); - DataSchemaRegistry.put(dataSchema); - } finally - { - is.close(); + try + { + DataSchema dataSchema = loader.loadSchema(is); + DataSchemaRegistry.put(dataSchema); + } finally + { + is.close(); + } } } } http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/ed953852/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java b/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java index 00d2d0c..71222f5 100644 --- a/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java +++ b/src/main/java/org/apache/pirk/schema/query/QuerySchemaLoader.java @@ -19,6 +19,7 @@ package org.apache.pirk.schema.query; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.util.HashSet; @@ -111,7 +112,7 @@ public class QuerySchemaLoader // Parse and load the schema file into a QuerySchema object; place in the schemaMap QuerySchemaLoader loader = new QuerySchemaLoader(); - InputStream is; + InputStream is = null; if (hdfs) { is = fs.open(new Path(schemaFile)); @@ -119,17 +120,26 @@ public class QuerySchemaLoader } else { - is = new FileInputStream(schemaFile); - logger.info("localFS: inputFile = " + schemaFile); + try + { + is = new FileInputStream(schemaFile); + logger.info("localFS: inputFile = " + schemaFile); + } catch (FileNotFoundException e) + { + logger.info("localFS: inputFile = " + schemaFile + " not found"); + } } - try - { - QuerySchema querySchema = loader.loadSchema(is); - QuerySchemaRegistry.put(querySchema); - } finally + if (is != null) { - is.close(); + try + { + QuerySchema querySchema = loader.loadSchema(is); + QuerySchemaRegistry.put(querySchema); + } finally + { + is.close(); + } } } }
