You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by mh...@apache.org on 2015/10/06 23:37:35 UTC
incubator-tinkerpop git commit: TINKERPOP3-867: TinkerGraph.saveGraph
creates directories as necessary
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/tp30 ce45d7826 -> df361a5dc
TINKERPOP3-867: TinkerGraph.saveGraph creates directories as necessary
TinkerGraphProvider no longer creates directories, so that we can get some coverage of the above code path (but only
when GraphTest is run in isolation).
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/df361a5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/df361a5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/df361a5d
Branch: refs/heads/tp30
Commit: df361a5dc3868a33a327a95a63504d6adac01075
Parents: ce45d78
Author: mhfrantz <mf...@redsealnetworks.com>
Authored: Tue Oct 6 14:36:12 2015 -0700
Committer: mhfrantz <mf...@redsealnetworks.com>
Committed: Tue Oct 6 14:36:15 2015 -0700
----------------------------------------------------------------------
.../gremlin/tinkergraph/structure/TinkerGraph.java | 9 ++++++++-
.../tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java | 1 -
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/df361a5d/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
index 47d052d..b683983 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
@@ -255,7 +255,14 @@ public final class TinkerGraph implements Graph {
private void saveGraph() {
final File f = new File(graphLocation);
- if (f.exists()) f.delete();
+ if (f.exists()) {
+ f.delete();
+ } else {
+ final File parent = f.getParentFile();
+ if (!parent.exists()) {
+ parent.mkdirs();
+ }
+ }
try {
if (graphFormat.equals("graphml")) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/df361a5d/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 db710f8..b41a552 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
@@ -73,7 +73,6 @@ public class TinkerGraphProvider extends AbstractGraphProvider {
if (requiresPersistence(test, testMethodName)) {
put(TinkerGraph.CONFIG_GRAPH_FORMAT, "gryo");
final File tempDir = TestHelper.makeTestDataPath(test, "temp");
- if (!tempDir.exists()) tempDir.mkdirs();
put(TinkerGraph.CONFIG_GRAPH_LOCATION,
tempDir.getAbsolutePath() + File.separator + testMethodName + ".kryo");
}