[felix-dev] branch master updated: FELIX-6177 : Use BlockingQueue instead of synchronized blocks in UpdateThread

[cz...@apache.org]

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

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new eff0e7f  FELIX-6177 : Use BlockingQueue instead of synchronized blocks in UpdateThread
eff0e7f is described below

commit eff0e7f0464958a8521d678be406f2aa3db1bbde
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu May 28 14:26:27 2020 +0200

    FELIX-6177 : Use BlockingQueue instead of synchronized blocks in UpdateThread
---
 configadmin/src/main/java/org/apache/felix/cm/impl/UpdateThread.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configadmin/src/main/java/org/apache/felix/cm/impl/UpdateThread.java b/configadmin/src/main/java/org/apache/felix/cm/impl/UpdateThread.java
index ebeaf7a..f64923e 100644
--- a/configadmin/src/main/java/org/apache/felix/cm/impl/UpdateThread.java
+++ b/configadmin/src/main/java/org/apache/felix/cm/impl/UpdateThread.java
@@ -178,7 +178,7 @@ public class UpdateThread implements Runnable
                 Log.logger.log( LogService.LOG_ERROR,
                     "Worker thread {0} did not terminate within 5 seconds; trying to kill", new Object[]
                         { workerBaseName } );
-                workerThread.interrupt();
+                workerThread.stop();
             }
         }
     }