[tinkerpop] branch tp4 updated: more random cleanups. taking a break to do some yardwork. its sunny out.

[okram]

This is an automated email from the ASF dual-hosted git repository.

okram pushed a commit to branch tp4
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


The following commit(s) were added to refs/heads/tp4 by this push:
     new a9dde82  more random cleanups. taking a break to do some yardwork. its 
sunny out.
a9dde82 is described below

commit a9dde82afe8ee5107b0a880db572712eec949db2
Author: Marko A. Rodriguez <okramma...@gmail.com>
AuthorDate: Tue Mar 26 14:44:29 2019 -0600

    more random cleanups. taking a break to do some yardwork. its sunny out.
---
 .../apache/tinkerpop/machine/species/LocalMachine.java   |  2 +-
 .../tinkerpop/machine/species/remote/MachineServer.java  | 16 +++++++++-------
 .../machine/species/remote/TraverserServer.java          |  2 --
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/LocalMachine.java
 
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/LocalMachine.java
index b29298a..79b958d 100644
--- 
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/LocalMachine.java
+++ 
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/LocalMachine.java
@@ -84,7 +84,7 @@ public final class LocalMachine implements Machine {
         return new LocalMachine();
     }
 
-    private static final <C> Optional<UUID> getSourceId(final Bytecode<C> 
bytecode) {
+    private static <C> Optional<UUID> getSourceId(final Bytecode<C> bytecode) {
         for (final SourceInstruction sourceInstruction : 
bytecode.getSourceInstructions()) {
             if (sourceInstruction.op().equals(WITH_SOURCE_CODE))
                 return Optional.of(UUID.fromString((String) 
sourceInstruction.args()[0]));
diff --git 
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/MachineServer.java
 
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/MachineServer.java
index 8c01808..18acf8e 100644
--- 
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/MachineServer.java
+++ 
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/MachineServer.java
@@ -66,13 +66,15 @@ public final class MachineServer implements AutoCloseable {
         return this.serverAlive.get();
     }
 
-    public synchronized void close() {
-        try {
-            this.serverAlive.set(Boolean.FALSE);
-            this.machineServerSocket.close();
-            this.machine.close();
-        } catch (final IOException e) {
-            throw new RuntimeException(e.getMessage(), e);
+    public void close() {
+        if (this.serverAlive.get()) {
+            try {
+                this.serverAlive.set(Boolean.FALSE);
+                this.machineServerSocket.close();
+                this.machine.close();
+            } catch (final IOException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
         }
     }
 
diff --git 
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/TraverserServer.java
 
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/TraverserServer.java
index 9c45994..c8c4c14 100644
--- 
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/TraverserServer.java
+++ 
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/species/remote/TraverserServer.java
@@ -115,6 +115,4 @@ public final class TraverserServer<C, S> implements 
AutoCloseable, Iterator<Trav
             }
         }
     }
-
-
 }