diff options
Diffstat (limited to 'java-compat/src')
| -rw-r--r-- | java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java | 12 | ||||
| -rw-r--r-- | java-compat/src/Ice/src/main/java/Ice/ConnectionI.java | 22 |
2 files changed, 17 insertions, 17 deletions
diff --git a/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java b/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java index ddb7056ea69..e22c884edb0 100644 --- a/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java +++ b/java-compat/src/Ice/src/main/java/Ice/Callback_Connection_heartbeat.java @@ -29,22 +29,22 @@ public abstract class Callback_Connection_heartbeat extends IceInternal.Callback } @Override - public final void _iceCompleted(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { try { - __result.getConnection().end_heartbeat(__result); + result.getConnection().end_heartbeat(result); } - catch(LocalException __ex) + catch(LocalException ex) { - exception(__ex); + exception(ex); } } @Override - public final void _iceSent(AsyncResult __result) + public final void _iceSent(AsyncResult result) { - sent(__result.sentSynchronously()); + sent(result.sentSynchronously()); } @Override diff --git a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java index ee3fc5ded4c..21ccc1d040c 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java +++ b/java-compat/src/Ice/src/main/java/Ice/ConnectionI.java @@ -554,7 +554,7 @@ public final class ConnectionI extends IceInternal.EventHandler end_heartbeat(begin_heartbeat()); } - private static final String __heartbeat_name = "heartbeat"; + private static final String _heartbeat_name = "heartbeat"; @Override public AsyncResult begin_heartbeat() @@ -575,22 +575,22 @@ public final class ConnectionI extends IceInternal.EventHandler } @Override - public AsyncResult begin_heartbeat(IceInternal.Functional_VoidCallback __responseCb, - final IceInternal.Functional_GenericCallback1<Ice.Exception> __exceptionCb, - IceInternal.Functional_BoolCallback __sentCb) + public AsyncResult begin_heartbeat(IceInternal.Functional_VoidCallback responseCb, + final IceInternal.Functional_GenericCallback1<Ice.Exception> exceptionCb, + IceInternal.Functional_BoolCallback sentCb) { - return begin_heartbeatInternal(new IceInternal.Functional_CallbackBase(false, __exceptionCb, __sentCb) + return begin_heartbeatInternal(new IceInternal.Functional_CallbackBase(false, exceptionCb, sentCb) { @Override - public final void _iceCompleted(AsyncResult __result) + public final void _iceCompleted(AsyncResult result) { try { - __result.getConnection().end_heartbeat(__result); + result.getConnection().end_heartbeat(result); } - catch(Exception __ex) + catch(Exception ex) { - __exceptionCb.apply(__ex); + exceptionCb.apply(ex); } } }); @@ -685,7 +685,7 @@ public final class ConnectionI extends IceInternal.EventHandler private AsyncResult begin_heartbeatInternal(IceInternal.CallbackBase cb) { - HeartbeatAsync result = new HeartbeatAsync(this, _communicator, _instance, __heartbeat_name, cb); + HeartbeatAsync result = new HeartbeatAsync(this, _communicator, _instance, _heartbeat_name, cb); result.invoke(); return result; } @@ -693,7 +693,7 @@ public final class ConnectionI extends IceInternal.EventHandler @Override public void end_heartbeat(AsyncResult ir) { - HeartbeatAsync r = HeartbeatAsync.check(ir, this, __heartbeat_name); + HeartbeatAsync r = HeartbeatAsync.check(ir, this, _heartbeat_name); r.waitForResponseOrUserEx(); } |