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, 0 deletions

diff --git a/cpp/test/Ice/dispatcher/TestI.cpp b/cpp/test/Ice/dispatcher/TestI.cpp
index 2a56d659f82..9140fc55fb0 100644
--- a/cpp/test/Ice/dispatcher/TestI.cpp
+++ b/cpp/test/Ice/dispatcher/TestI.cpp
@@ -11,6 +11,7 @@
 #include <Ice/Ice.h>
 #include <Dispatcher.h>
 #include <TestCommon.h>
+#include <IceUtil/Thread.h>
 
 using namespace std;
 
@@ -21,6 +22,12 @@ TestIntfI::op(const Ice::Current&)
 }
 
 void
+TestIntfI::sleep(Ice::Int to, const Ice::Current&)
+{
+    IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(to));
+}
+
+void
 TestIntfI::opWithPayload(const Ice::ByteSeq&, const Ice::Current&)
 {
     test(Dispatcher::isDispatcherThread());