summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-08-19 15:43:12 -0400
committerBernard Normier <bernard@zeroc.com>2014-08-19 15:43:12 -0400
commit66f724f2aceffe0160e018cae12d4f203f11cd01 (patch)
tree1563b7d71c6b539ab31a46391c0742b984dbac4e
parentImplemented sourceAddress for js tcp transport (diff)
downloadice-66f724f2aceffe0160e018cae12d4f203f11cd01.tar.bz2
ice-66f724f2aceffe0160e018cae12d4f203f11cd01.tar.xz
ice-66f724f2aceffe0160e018cae12d4f203f11cd01.zip
Fixed ICE-5604: thread pool error handling
-rw-r--r--cs/src/Ice/ThreadPool.cs2
-rw-r--r--java/src/IceInternal/ThreadPool.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/cs/src/Ice/ThreadPool.cs b/cs/src/Ice/ThreadPool.cs
index 53a44bba830..5b28c54a2b6 100644
--- a/cs/src/Ice/ThreadPool.cs
+++ b/cs/src/Ice/ThreadPool.cs
@@ -220,7 +220,6 @@ namespace IceInternal
for(int i = 0; i < _size; ++i)
{
WorkerThread thread = new WorkerThread(this, _threadPrefix + "-" + _threadIndex++);
- _threads.Add(thread);
#if !SILVERLIGHT
if(_hasPriority)
{
@@ -233,6 +232,7 @@ namespace IceInternal
#else
thread.start();
#endif
+ _threads.Add(thread);
}
}
catch(System.Exception ex)
diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java
index 0e57a6a61c7..56836072f54 100644
--- a/java/src/IceInternal/ThreadPool.java
+++ b/java/src/IceInternal/ThreadPool.java
@@ -206,7 +206,6 @@ public final class ThreadPool
for(int i = 0; i < _size; i++)
{
EventHandlerThread thread = new EventHandlerThread(_threadPrefix + "-" + _threadIndex++);
- _threads.add(thread);
if(_hasPriority)
{
thread.start(_priority);
@@ -215,6 +214,7 @@ public final class ThreadPool
{
thread.start(java.lang.Thread.NORM_PRIORITY);
}
+ _threads.add(thread);
}
}
catch(RuntimeException ex)