summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/GetConnectionOutgoingAsync.java
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-09-27 16:31:46 -0700
committerMatthew Newhook <matthew@zeroc.com>2014-09-27 16:32:21 -0700
commit4951bbabdd6bd33a8e9ca0cdd46aad613a634626 (patch)
tree8634b14a258d2c9cee0e17a12af805e1af3fec76 /java/src/IceInternal/GetConnectionOutgoingAsync.java
parentFixed deadlock in connection binding code (ICE-5693) (diff)
downloadice-4951bbabdd6bd33a8e9ca0cdd46aad613a634626.tar.bz2
ice-4951bbabdd6bd33a8e9ca0cdd46aad613a634626.tar.xz
ice-4951bbabdd6bd33a8e9ca0cdd46aad613a634626.zip
- begin_ now never interrupts.
- All potentially blocking Ice APIs are interruption points. - Fixes to the incoming/outgoing factories and shutdown procedure - Fixed bug where connect() was from a user thread. - Added lots more tests to the interrupt test suite.
Diffstat (limited to 'java/src/IceInternal/GetConnectionOutgoingAsync.java')
-rw-r--r--java/src/IceInternal/GetConnectionOutgoingAsync.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/java/src/IceInternal/GetConnectionOutgoingAsync.java b/java/src/IceInternal/GetConnectionOutgoingAsync.java
index 75ef2d9b60f..33613a5c078 100644
--- a/java/src/IceInternal/GetConnectionOutgoingAsync.java
+++ b/java/src/IceInternal/GetConnectionOutgoingAsync.java
@@ -125,6 +125,15 @@ public class GetConnectionOutgoingAsync extends OutgoingAsyncBase implements Out
});
}
+ @Override
+ protected void cancelRequest()
+ {
+ if(_handler != null)
+ {
+ _handler.asyncRequestCanceled(this, new Ice.OperationInterruptedException());
+ }
+ }
+
private void handleException(Ice.Exception exc)
{
try