summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-08-26 17:48:47 +0200
committerBenoit Foucher <benoit@zeroc.com>2019-08-26 17:55:56 +0200
commit1c91379665948e66384305507c95ed6c3b1a78e1 (patch)
treeae5c6cd983fcafaf7ac64aa8c33ec6f79842c074 /java
parentRemoved work-around for OpenSSL error on AIX, as it's no longer needed with O... (diff)
downloadice-1c91379665948e66384305507c95ed6c3b1a78e1.tar.bz2
ice-1c91379665948e66384305507c95ed6c3b1a78e1.tar.xz
ice-1c91379665948e66384305507c95ed6c3b1a78e1.zip
Fixed C++/Java thread pool to no longer print bogus warning on shutdown, fixes #496
Diffstat (limited to 'java')
-rw-r--r--java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java
index 99ca15a7815..9f45dec5505 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ThreadPool.java
@@ -413,6 +413,11 @@ public final class ThreadPool implements java.util.concurrent.Executor
}
catch(DestroyedException ex)
{
+ synchronized(this)
+ {
+ --_inUse;
+ thread.setState(com.zeroc.Ice.Instrumentation.ThreadState.ThreadStateIdle);
+ }
return;
}
catch(java.lang.Exception ex)