You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/08/17 16:33:49 UTC

incubator-tinkerpop git commit: Don't re-copy files for gremlin-server.sh -i

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/tp30 197036c82 -> 46688dd80


Don't re-copy files for gremlin-server.sh -i

Re-copying files that already exist seems to be a problem for Gremlin Server on windows.  Check of existence first and if present, don't copy. TINKERPOP3-804


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/46688dd8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/46688dd8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/46688dd8

Branch: refs/heads/tp30
Commit: 46688dd8076189fa3d43a4bdc6f80e6ab543392e
Parents: 197036c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 17 10:32:33 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 17 10:32:33 2015 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/46688dd8/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
index 07102fe..2e8877d 100644
--- a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
+++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
@@ -96,9 +96,12 @@ class DependencyGrabber {
 
     private static Closure copyTo(final Path path) {
         return { Path p ->
+            // check for existence prior to copying as windows systems seem to have problems with REPLACE_EXISTING
             def copying = path.resolve(p.fileName)
-            Files.copy(p, copying, StandardCopyOption.REPLACE_EXISTING)
-            println "Copying - $copying"
+            if (!copying.toFile().exists()) {
+                Files.copy(p, copying, StandardCopyOption.REPLACE_EXISTING)
+                println "Copying - $copying"
+            }
         }
     }