diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-07-10 17:17:55 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-07-10 17:17:55 -0230 |
| commit | 9326917abfa8ebd9815e192db2dd57cd8e85179d (patch) | |
| tree | 26045ee4f12e9eab55cbeaefb6a3855ac16d6f50 /java/src/IceInternal/ConnectRequestHandler.java | |
| parent | Partial fix for ICE-5548: better C++11 detection (diff) | |
| download | ice-9326917abfa8ebd9815e192db2dd57cd8e85179d.tar.bz2 ice-9326917abfa8ebd9815e192db2dd57cd8e85179d.tar.xz ice-9326917abfa8ebd9815e192db2dd57cd8e85179d.zip | |
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.
Diffstat (limited to 'java/src/IceInternal/ConnectRequestHandler.java')
| -rw-r--r-- | java/src/IceInternal/ConnectRequestHandler.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/IceInternal/ConnectRequestHandler.java b/java/src/IceInternal/ConnectRequestHandler.java index 8b2f346a997..0505688cdda 100644 --- a/java/src/IceInternal/ConnectRequestHandler.java +++ b/java/src/IceInternal/ConnectRequestHandler.java @@ -333,7 +333,7 @@ public class ConnectRequestHandler // if(!_requests.isEmpty()) { - _reference.getInstance().clientThreadPool().execute(new DispatchWorkItem() + _reference.getInstance().clientThreadPool().execute(new DispatchWorkItem(_connection) { public void run() @@ -487,7 +487,7 @@ public class ConnectRequestHandler { assert(_exception == null && !_requests.isEmpty()); _exception = ex.get(); - _reference.getInstance().clientThreadPool().execute(new DispatchWorkItem() + _reference.getInstance().clientThreadPool().execute(new DispatchWorkItem(_connection) { public void run() @@ -503,7 +503,7 @@ public class ConnectRequestHandler { assert(_exception == null && !_requests.isEmpty()); _exception = ex; - _reference.getInstance().clientThreadPool().execute(new DispatchWorkItem() + _reference.getInstance().clientThreadPool().execute(new DispatchWorkItem(_connection) { public void run() @@ -517,7 +517,7 @@ public class ConnectRequestHandler if(!sentCallbacks.isEmpty()) { _reference.getInstance().clientThreadPool().execute( - new DispatchWorkItem() + new DispatchWorkItem(_connection) { public void run() |