You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2019/04/08 16:09:37 UTC
[tinkerpop] branch tp4 updated: minor tweaks to servers to try and
make sure address binding doesn't fail in test suite.
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 d77e0b7 minor tweaks to servers to try and make sure address binding doesn't fail in test suite.
d77e0b7 is described below
commit d77e0b765a99e8ce498aefa79adfcb24091a0ab6
Author: Marko A. Rodriguez <ok...@gmail.com>
AuthorDate: Mon Apr 8 10:09:30 2019 -0600
minor tweaks to servers to try and make sure address binding doesn't fail in test suite.
---
.../apache/tinkerpop/machine/species/remote/MachineServer.java | 8 +++-----
.../apache/tinkerpop/machine/species/remote/TraverserServer.java | 6 ++----
2 files changed, 5 insertions(+), 9 deletions(-)
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 e041d83..8931f40 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
@@ -41,7 +41,7 @@ public final class MachineServer implements AutoCloseable {
private final int machineServerPort;
private ServerSocket machineServerSocket;
- private AtomicBoolean serverAlive = new AtomicBoolean(Boolean.FALSE);
+ private AtomicBoolean serverAlive = new AtomicBoolean(Boolean.TRUE);
private final Machine machine = LocalMachine.open();
public MachineServer(final int machineServerPort) {
@@ -51,7 +51,6 @@ public final class MachineServer implements AutoCloseable {
private void run() {
try {
- this.serverAlive.set(Boolean.TRUE);
this.machineServerSocket = new ServerSocket(this.machineServerPort);
while (this.serverAlive.get()) {
final Socket clientSocket = this.machineServerSocket.accept();
@@ -66,10 +65,9 @@ public final class MachineServer implements AutoCloseable {
public void close() {
if (this.serverAlive.get()) {
try {
- if (null != this.machineServerSocket)
- this.machineServerSocket.close();
- this.machine.close();
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 4e61fff..5153f92 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
@@ -38,7 +38,7 @@ public final class TraverserServer<C, S> implements AutoCloseable, Iterator<Trav
private final TraverserSet<C, S> traverserSet = new TraverserSet<>();
private final int serverPort;
private ServerSocket serverSocket;
- private AtomicBoolean serverAlive = new AtomicBoolean(Boolean.FALSE);
+ private AtomicBoolean serverAlive = new AtomicBoolean(Boolean.TRUE);
public TraverserServer(final int serverPort) {
this.serverPort = serverPort;
@@ -47,7 +47,6 @@ public final class TraverserServer<C, S> implements AutoCloseable, Iterator<Trav
private void run() {
try {
- this.serverAlive.set(Boolean.TRUE);
this.serverSocket = new ServerSocket(this.serverPort);
while (this.serverAlive.get()) {
final Socket clientSocket = this.serverSocket.accept();
@@ -89,9 +88,8 @@ public final class TraverserServer<C, S> implements AutoCloseable, Iterator<Trav
public synchronized void close() {
if (this.serverAlive.get()) {
try {
- if (null != this.serverSocket)
- this.serverSocket.close();
this.serverAlive.set(Boolean.FALSE);
+ this.serverSocket.close();
} catch (final IOException e) {
throw new RuntimeException(e.getMessage(), e);
}