Repository: tinkerpop Updated Branches: refs/heads/master de29c768a -> 20bc5a3bb
Add null checking for configuration Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/32a8ee6d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/32a8ee6d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/32a8ee6d Branch: refs/heads/master Commit: 32a8ee6d2faed5bfbb36dd30d17dff7d6cff03e0 Parents: f49b279 Author: Justin Chu <15710241+justinch...@users.noreply.github.com> Authored: Tue Aug 21 15:13:25 2018 -0400 Committer: Justin Chu <15710241+justinch...@users.noreply.github.com> Committed: Tue Aug 21 15:18:50 2018 -0400 ---------------------------------------------------------------------- .../apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +- .../apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32a8ee6d/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java ---------------------------------------------------------------------- diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java index 701c85c..b018938 100644 --- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java +++ b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java @@ -57,7 +57,7 @@ public abstract class AbstractNeo4jGraphProvider extends AbstractGraphProvider { graph.close(); } - if (configuration.containsKey(Neo4jGraph.CONFIG_DIRECTORY)) { + if (null != configuration && configuration.containsKey(Neo4jGraph.CONFIG_DIRECTORY)) { // this is a non-in-sideEffects configuration so blow away the directory final File graphDirectory = new File(configuration.getString(Neo4jGraph.CONFIG_DIRECTORY)); deleteDirectory(graphDirectory); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32a8ee6d/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java ---------------------------------------------------------------------- diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java index 7f0e6f3..911137d 100644 --- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java @@ -85,7 +85,7 @@ public class TinkerGraphProvider extends AbstractGraphProvider { graph.close(); // in the even the graph is persisted we need to clean up - final String graphLocation = configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null); + final String graphLocation = null != configuration ? configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null) : null; if (graphLocation != null) { final File f = new File(graphLocation); f.delete();
