Resetting data.schema and query.schema properties before starting the QuerySchemaUtilsTest - attempt to fix the Jenkins instabilities
Project: http://git-wip-us.apache.org/repos/asf/incubator-pirk/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-pirk/commit/b90b418b Tree: http://git-wip-us.apache.org/repos/asf/incubator-pirk/tree/b90b418b Diff: http://git-wip-us.apache.org/repos/asf/incubator-pirk/diff/b90b418b Branch: refs/heads/master Commit: b90b418b163898fe4bed50dfa05b53a44acc9245 Parents: 7d47555 Author: eawilliams <[email protected]> Authored: Sun Jul 31 12:47:20 2016 -0400 Committer: eawilliams <[email protected]> Committed: Sun Jul 31 12:47:20 2016 -0400 ---------------------------------------------------------------------- src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java | 2 +- .../java/org/apache/pirk/schema/query/QuerySchemaRegistry.java | 2 +- src/main/java/org/apache/pirk/utils/SystemConfiguration.java | 2 +- src/test/java/test/general/QueryParserUtilsTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/b90b418b/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java b/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java index af90e8d..ac6d124 100644 --- a/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java +++ b/src/main/java/org/apache/pirk/schema/data/DataSchemaRegistry.java @@ -74,7 +74,7 @@ public class DataSchemaRegistry { return registry.keySet(); } - + /** * Clear the registry */ http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/b90b418b/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java b/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java index ce2a801..0adae3c 100644 --- a/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java +++ b/src/main/java/org/apache/pirk/schema/query/QuerySchemaRegistry.java @@ -68,7 +68,7 @@ public class QuerySchemaRegistry { return registry.keySet(); } - + /** * Clear the registry */ http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/b90b418b/src/main/java/org/apache/pirk/utils/SystemConfiguration.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/pirk/utils/SystemConfiguration.java b/src/main/java/org/apache/pirk/utils/SystemConfiguration.java index ae5f485..c71e64f 100755 --- a/src/main/java/org/apache/pirk/utils/SystemConfiguration.java +++ b/src/main/java/org/apache/pirk/utils/SystemConfiguration.java @@ -194,7 +194,7 @@ public class SystemConfiguration */ public static void loadPropsFromStream(String name) { - try(InputStream stream = SystemConfiguration.class.getClassLoader().getResourceAsStream(name)) + try (InputStream stream = SystemConfiguration.class.getClassLoader().getResourceAsStream(name)) { if (stream != null) { http://git-wip-us.apache.org/repos/asf/incubator-pirk/blob/b90b418b/src/test/java/test/general/QueryParserUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/test/general/QueryParserUtilsTest.java b/src/test/java/test/general/QueryParserUtilsTest.java index 6f0a03b..9a086f8 100644 --- a/src/test/java/test/general/QueryParserUtilsTest.java +++ b/src/test/java/test/general/QueryParserUtilsTest.java @@ -58,7 +58,7 @@ public class QueryParserUtilsTest QuerySchemaRegistry.clearRegistry(); SystemConfiguration.setProperty("data.schemas", "none"); SystemConfiguration.setProperty("query.schemas", "none"); - + Inputs.createSchemaFiles(null, false, null); dSchema = DataSchemaRegistry.get(Inputs.TEST_DATA_SCHEMA_NAME);
