diff options
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/Ice/AsyncResult.java | 4 | ||||
-rw-r--r-- | java/src/Ice/ConnectionI.java | 8 | ||||
-rw-r--r-- | java/src/Ice/ObjectPrxHelperBase.java | 20 | ||||
-rw-r--r-- | java/src/Ice/_AMD_Object_ice_invoke.java | 2 | ||||
-rw-r--r-- | java/src/Ice/_ObjectDelD.java | 8 | ||||
-rw-r--r-- | java/src/IceInternal/Direct.java | 2 | ||||
-rw-r--r-- | java/src/IceInternal/IncomingAsync.java | 2 |
7 files changed, 23 insertions, 23 deletions
diff --git a/java/src/Ice/AsyncResult.java b/java/src/Ice/AsyncResult.java index 4598f3322bd..d7747c8656c 100644 --- a/java/src/Ice/AsyncResult.java +++ b/java/src/Ice/AsyncResult.java @@ -172,12 +172,12 @@ public class AsyncResult return _operation; } - public final IceInternal.BasicStream __os() + public final IceInternal.BasicStream __getOs() { return _os; } - public final IceInternal.BasicStream __is() + public final IceInternal.BasicStream __getIs() { assert _is != null; // Can't only be called if response is received. return _is; diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java index 0c663fc23b6..31707b813cb 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/ConnectionI.java @@ -350,7 +350,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne throws IceInternal.LocalExceptionWrapper { int requestId = 0; - final IceInternal.BasicStream os = out.__os(); + final IceInternal.BasicStream os = out.__getOs(); if(_exception != null) { @@ -393,7 +393,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne int status; try { - status = sendMessage(new OutgoingMessage(out, out.__os(), compress, requestId)); + status = sendMessage(new OutgoingMessage(out, out.__getOs(), compress, requestId)); } catch(Ice.LocalException ex) { @@ -751,12 +751,12 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne _batchStream.pos(IceInternal.Protocol.headerSize); _batchStream.writeInt(_batchRequestNum); - _batchStream.swap(outAsync.__os()); + _batchStream.swap(outAsync.__getOs()); int status; try { - OutgoingMessage message = new OutgoingMessage(outAsync, outAsync.__os(), _batchRequestCompress, 0); + OutgoingMessage message = new OutgoingMessage(outAsync, outAsync.__getOs(), _batchRequestCompress, 0); status = sendMessage(message); } catch(Ice.LocalException ex) diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java index 94132ea1963..c94b80b5442 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/ObjectPrxHelperBase.java @@ -209,7 +209,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable try { __result.__prepare(__ice_isA_name, OperationMode.Nonmutating, __context, __explicitCtx); - IceInternal.BasicStream __os = __result.__os(); + IceInternal.BasicStream __os = __result.__getOs(); __os.writeString(__id); __os.endWriteEncaps(); __result.__send(true); @@ -243,7 +243,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } } boolean __ret; - IceInternal.BasicStream __is = __result.__is(); + IceInternal.BasicStream __is = __result.__getIs(); __is.startReadEncaps(); __ret = __is.readBool(); __is.endReadEncaps(); @@ -381,7 +381,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable try { __result.__prepare(__ice_ping_name, OperationMode.Nonmutating, __context, __explicitCtx); - IceInternal.BasicStream __os = __result.__os(); + IceInternal.BasicStream __os = __result.__getOs(); __os.endWriteEncaps(); __result.__send(true); } @@ -540,7 +540,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable try { __result.__prepare(__ice_ids_name, OperationMode.Nonmutating, __context, __explicitCtx); - IceInternal.BasicStream __os = __result.__os(); + IceInternal.BasicStream __os = __result.__getOs(); __os.endWriteEncaps(); __result.__send(true); } @@ -574,7 +574,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } } String[] __ret = null; - IceInternal.BasicStream __is = __result.__is(); + IceInternal.BasicStream __is = __result.__getIs(); __is.startReadEncaps(); __ret = StringSeqHelper.read(__is); __is.endReadEncaps(); @@ -716,7 +716,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable try { __result.__prepare(__ice_id_name, OperationMode.Nonmutating, __context, __explicitCtx); - IceInternal.BasicStream __os = __result.__os(); + IceInternal.BasicStream __os = __result.__getOs(); __os.endWriteEncaps(); __result.__send(true); } @@ -749,7 +749,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } } String __ret = null; - IceInternal.BasicStream __is = __result.__is(); + IceInternal.BasicStream __is = __result.__getIs(); __is.startReadEncaps(); __ret = __is.readString(); __is.endReadEncaps(); @@ -965,7 +965,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable try { __result.__prepare(operation, mode, __context, __explicitCtx); - IceInternal.BasicStream __os = __result.__os(); + IceInternal.BasicStream __os = __result.__getOs(); __os.writeBlob(inParams); __os.endWriteEncaps(); __result.__send(true); @@ -995,7 +995,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable boolean ok = __result.__wait(); if(_reference.getMode() == IceInternal.Reference.ModeTwoway) { - IceInternal.BasicStream __is = __result.__is(); + IceInternal.BasicStream __is = __result.__getIs(); __is.startReadEncaps(); int sz = __is.getReadEncapsSize(); if(outParams != null) @@ -2110,7 +2110,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable throw new UnknownUserException(__ex.ice_name(), __ex); } } - IceInternal.BasicStream __is = __result.__is(); + IceInternal.BasicStream __is = __result.__getIs(); __is.skipEmptyEncaps(); } } diff --git a/java/src/Ice/_AMD_Object_ice_invoke.java b/java/src/Ice/_AMD_Object_ice_invoke.java index 4de65179139..f5f8bd6e541 100644 --- a/java/src/Ice/_AMD_Object_ice_invoke.java +++ b/java/src/Ice/_AMD_Object_ice_invoke.java @@ -24,7 +24,7 @@ final class _AMD_Object_ice_invoke extends IceInternal.IncomingAsync implements { try { - __os().writeBlob(outParams); + __getOs().writeBlob(outParams); } catch(Ice.LocalException ex) { diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java index 664cd7201b7..c7830d9b5a5 100644 --- a/java/src/Ice/_ObjectDelD.java +++ b/java/src/Ice/_ObjectDelD.java @@ -39,7 +39,7 @@ public class _ObjectDelD implements _ObjectDel try { - DispatchStatus __status = __direct.servant().__collocDispatch(__direct); + DispatchStatus __status = __direct.getServant().__collocDispatch(__direct); assert __status == DispatchStatus.DispatchOK; return __result.value; } @@ -88,7 +88,7 @@ public class _ObjectDelD implements _ObjectDel try { - DispatchStatus __status = __direct.servant().__collocDispatch(__direct); + DispatchStatus __status = __direct.getServant().__collocDispatch(__direct); assert __status == DispatchStatus.DispatchOK; } catch(Throwable __ex) @@ -137,7 +137,7 @@ public class _ObjectDelD implements _ObjectDel try { - DispatchStatus __status = __direct.servant().__collocDispatch(__direct); + DispatchStatus __status = __direct.getServant().__collocDispatch(__direct); assert __status == DispatchStatus.DispatchOK; return __result.value; } @@ -187,7 +187,7 @@ public class _ObjectDelD implements _ObjectDel try { - DispatchStatus __status = __direct.servant().__collocDispatch(__direct); + DispatchStatus __status = __direct.getServant().__collocDispatch(__direct); assert __status == DispatchStatus.DispatchOK; return __result.value; } diff --git a/java/src/IceInternal/Direct.java b/java/src/IceInternal/Direct.java index 6a94687ed22..38669588970 100644 --- a/java/src/IceInternal/Direct.java +++ b/java/src/IceInternal/Direct.java @@ -114,7 +114,7 @@ public abstract class Direct implements Ice.Request } public Ice.Object - servant() + getServant() { return _servant; } diff --git a/java/src/IceInternal/IncomingAsync.java b/java/src/IceInternal/IncomingAsync.java index 9bc9a29cd92..a8c696a175a 100644 --- a/java/src/IceInternal/IncomingAsync.java +++ b/java/src/IceInternal/IncomingAsync.java @@ -206,7 +206,7 @@ public class IncomingAsync extends IncomingBase implements Ice.AMDCallback } final protected BasicStream - __os() + __getOs() { return _os; } |