summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rw-r--r--java/src/IceInternal/Outgoing.java15
-rw-r--r--java/src/IceInternal/PropertyNames.java3
2 files changed, 14 insertions, 4 deletions
diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java
index 545f8f79800..eec1e4eb8f0 100644
--- a/java/src/IceInternal/Outgoing.java
+++ b/java/src/IceInternal/Outgoing.java
@@ -107,7 +107,7 @@ public final class Outgoing implements OutgoingMessageCallback
}
catch(Ice.OperationInterruptedException ex)
{
- if(_handler.requestCanceled(this, new Ice.OperationInterruptedException()))
+ if(_handler.requestCanceled(this, ex))
{
//
// Wait for the exception to propagate. It's possible the request handler ignores
@@ -134,6 +134,10 @@ public final class Outgoing implements OutgoingMessageCallback
}
}
}
+ else
+ {
+ throw ex;
+ }
}
boolean timedOut = false;
@@ -183,7 +187,8 @@ public final class Outgoing implements OutgoingMessageCallback
if(timedOut)
{
- if(_handler.requestCanceled(this, new Ice.InvocationTimeoutException()))
+ Ice.InvocationTimeoutException ex = new Ice.InvocationTimeoutException();
+ if(_handler.requestCanceled(this, ex))
{
//
// Wait for the exception to propagate. It's possible the request handler ignores
@@ -199,7 +204,7 @@ public final class Outgoing implements OutgoingMessageCallback
{
wait();
}
- catch(InterruptedException ex)
+ catch(InterruptedException e)
{
interrupted = true;
}
@@ -210,6 +215,10 @@ public final class Outgoing implements OutgoingMessageCallback
}
}
}
+ else
+ {
+ throw ex;
+ }
}
if(_exception != null)
diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java
index 13b03bc9b20..0d80e319830 100644
--- a/java/src/IceInternal/PropertyNames.java
+++ b/java/src/IceInternal/PropertyNames.java
@@ -6,7 +6,7 @@
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Aug 13 09:11:52 2014
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Aug 13 15:11:58 2014
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -179,6 +179,7 @@ public final class PropertyNames
new Property("Ice\\.Warn\\.UnknownProperties", false, null),
new Property("Ice\\.Warn\\.UnusedProperties", false, null),
new Property("Ice\\.CacheMessageBuffers", false, null),
+ new Property("Ice\\.BackgroundIO", false, null),
null
};