ICE-5573 - .NET TimeoutException ignores Dispatcher

- Added test for C++, C# & Java to the dispatcher test
  to ensure that the invocation timeout is throwin
  in the correct thread.
- Pass the connection to the dispatcher invocation in
  more cases.

1 files changed, 9 insertions, 1 deletions

diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index d7884f54964..d7c26aced63 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -141,6 +141,14 @@ class ThreadPoolDestroyedException
 
 }
 
+
+IceInternal::DispatchWorkItem::DispatchWorkItem() {
+}
+
+IceInternal::DispatchWorkItem::DispatchWorkItem(const Ice::ConnectionPtr& connection) : _connection(connection) {
+    
+}
+
 void
 IceInternal::DispatchWorkItem::execute(ThreadPoolCurrent& current)
 {
@@ -150,7 +158,7 @@ IceInternal::DispatchWorkItem::execute(ThreadPoolCurrent& current)
     {
         try
         {
-            dispatcher->dispatch(this, 0);
+            dispatcher->dispatch(this, _connection);
         }
         catch(const std::exception& ex)
         {