summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/Functional_CallbackBase.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-06-27 10:31:41 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-06-27 10:31:41 +0200
commita4f93259dc3494d98addf38e69b87eb557d432b3 (patch)
treed2b78bb5cea24e33dc1b46be22dba6167e96c9ed /java/src/IceInternal/Functional_CallbackBase.java
parentFix for ICE-5515 (ice_staticId on proxies) in Java, C#, Python, Ruby and PHP ... (diff)
downloadice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.bz2
ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.xz
ice-a4f93259dc3494d98addf38e69b87eb557d432b3.zip
Better collocation optimization, fix for ICE-5489, ICE-5484
Diffstat (limited to 'java/src/IceInternal/Functional_CallbackBase.java')
-rw-r--r--java/src/IceInternal/Functional_CallbackBase.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/IceInternal/Functional_CallbackBase.java b/java/src/IceInternal/Functional_CallbackBase.java
index e66a5938bb0..1e61ca2e506 100644
--- a/java/src/IceInternal/Functional_CallbackBase.java
+++ b/java/src/IceInternal/Functional_CallbackBase.java
@@ -12,18 +12,18 @@ package IceInternal;
public abstract class Functional_CallbackBase extends IceInternal.CallbackBase
{
public Functional_CallbackBase(boolean responseCb,
- Functional_GenericCallback1<Ice.LocalException> localExceptionCb,
+ Functional_GenericCallback1<Ice.Exception> exceptionCb,
Functional_BoolCallback sentCb)
{
- CallbackBase.check(responseCb || localExceptionCb != null);
- __localExceptionCb = localExceptionCb;
+ CallbackBase.check(responseCb || exceptionCb != null);
+ __exceptionCb = exceptionCb;
__sentCb = sentCb;
}
- protected Functional_CallbackBase(Functional_GenericCallback1<Ice.LocalException> localExceptionCb,
+ protected Functional_CallbackBase(Functional_GenericCallback1<Ice.Exception> exceptionCb,
Functional_BoolCallback sentCb)
{
- __localExceptionCb = localExceptionCb;
+ __exceptionCb = exceptionCb;
__sentCb = sentCb;
}
@@ -37,6 +37,6 @@ public abstract class Functional_CallbackBase extends IceInternal.CallbackBase
public abstract void __completed(Ice.AsyncResult __result);
- protected final Functional_GenericCallback1<Ice.LocalException> __localExceptionCb;
+ protected final Functional_GenericCallback1<Ice.Exception> __exceptionCb;
protected final Functional_BoolCallback __sentCb;
}