summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Milanesio <luca.milanesio@gmail.com>2017-04-05 07:37:48 +0100
committerLuca Milanesio <luca.milanesio@gmail.com>2017-04-05 07:39:48 +0100
commit0bee4f97cee701cff59a2075d5ee2eaa420a263c (patch)
tree43c90a8702f197fda3ce5e8fae22acfdc2095d86
parent850facf11bbe98ba42e7b0b612f6cb9fc281fe2d (diff)
Prevents 2x stop() calls during IntegrationTest
It seems that NoteDB does not manage gracefully the double invocations of the GerritServer.stop and throws a NPE. However, that is really a corner case that never happens in real life; setting the server instance to null prevents multiple close() invocations on the same server object. Change-Id: I34da521830ca4caa935c2968c567cc5f4daca44d
-rw-r--r--gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
index dbc65a2b22..c4be97c458 100644
--- a/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
+++ b/gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
@@ -514,6 +514,7 @@ public abstract class AbstractDaemonTest {
}
if (server != commonServer) {
server.stop();
+ server = null;
}
}