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, 7 insertions, 2 deletions

diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index 6d2c9d283e5..f4df601605c 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -78,7 +78,6 @@ public:
     }
     void finish(const EventHandlerPtr&);
     void execute(const ThreadPoolWorkItemPtr&);
-
     void joinWithAllThreads();
 
     std::string prefix() const;
@@ -184,9 +183,15 @@ public:
 
 class DispatchWorkItem : public ThreadPoolWorkItem, public Ice::DispatcherCall
 {
-private:
+public:
+
+    DispatchWorkItem();
+    DispatchWorkItem(const Ice::ConnectionPtr& connection);
  
+ private:
+
     virtual void execute(ThreadPoolCurrent&);
+    Ice::ConnectionPtr _connection;
 };
 
 class ThreadPoolWorkQueue : public EventHandler, public IceUtil::Mutex