invoke setRunner method in ConcurrentServerRunner so that Instrumente…

…dConcurrentServerRunner's overriden impl can be used in tests
qos-ch · May 1, 2013 · d155727 · d155727 · ceharris · May 1, 2013
1 parent 91b953a
commit d155727
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/logback-core/src/main/java/ch/qos/logback/core/net/server/ConcurrentServerRunner.java b/logback-core/src/main/java/ch/qos/logback/core/net/server/ConcurrentServerRunner.java
@@ -129,7 +129,7 @@ private Collection<T> copyClients() {
    * {@inheritDoc}
    */
   public void run() {
-    running = true;
+    setRunning(true);
     try {
       addInfo("listening on " + listener);
       while (!Thread.currentThread().isInterrupted()) {
@@ -155,7 +155,7 @@ public void run() {
       addError("listener: " + ex);
     }
 
-    running = false;    
+    setRunning(false);
     addInfo("shutting down");
     listener.close();
   }

diff --git a/logback-core/src/test/java/ch/qos/logback/core/net/server/ConcurrentServerRunnerTest.java b/logback-core/src/test/java/ch/qos/logback/core/net/server/ConcurrentServerRunnerTest.java
@@ -61,7 +61,7 @@ public void tearDown() throws Exception {
   public void testStartStop() throws Exception {
     assertFalse(runner.isRunning());
     executor.execute(runner);
-    assertTrue(runner.awaitRunState(true, SHORT_DELAY));
+    assertTrue(runner.awaitRunState(true, DELAY));
     int retries = DELAY / SHORT_DELAY;
     synchronized (listener) {
       while (retries-- > 0 && listener.getWaiter() == null) {