diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2017-04-05 07:41:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-04-05 07:41:12 +0000 |
| commit | e248839c4143523b0138a7d6fb6c129490813cb1 (patch) | |
| tree | 609acdba5f37316e5d8f4328066a82dd99ae22ff | |
| parent | c7e280935767d7328e6dd52330c029000a542cbb (diff) | |
| parent | 0bee4f97cee701cff59a2075d5ee2eaa420a263c (diff) | |
Merge "Prevents 2x stop() calls during IntegrationTest" into stable-2.14
| -rw-r--r-- | gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java | 1 |
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; } } |