diff options
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/Ice/ConnectionI.java | 12 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/Ice/InputStream.java | 4 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/Ice/ObjectHolder.java | 22 |
3 files changed, 11 insertions, 27 deletions
diff --git a/java/src/Ice/src/main/java/Ice/ConnectionI.java b/java/src/Ice/src/main/java/Ice/ConnectionI.java index 31e5e9705a6..3d4e68c3848 100644 --- a/java/src/Ice/src/main/java/Ice/ConnectionI.java +++ b/java/src/Ice/src/main/java/Ice/ConnectionI.java @@ -906,7 +906,7 @@ public final class ConnectionI extends IceInternal.EventHandler } if(size > _readStream.size()) { - _readStream.resize(size, true); + _readStream.resize(size); } _readStream.pos(pos); } @@ -1022,7 +1022,7 @@ public final class ConnectionI extends IceInternal.EventHandler { _logger.warning("maximum datagram size of " + _readStream.pos() + " exceeded"); } - _readStream.resize(IceInternal.Protocol.headerSize, true); + _readStream.resize(IceInternal.Protocol.headerSize); _readStream.pos(0); _readHeader = true; return; @@ -1041,7 +1041,7 @@ public final class ConnectionI extends IceInternal.EventHandler String s = "datagram connection exception:\n" + ex + '\n' + _desc; _logger.warning(s); } - _readStream.resize(IceInternal.Protocol.headerSize, true); + _readStream.resize(IceInternal.Protocol.headerSize); _readStream.pos(0); _readHeader = true; } @@ -1995,7 +1995,7 @@ public final class ConnectionI extends IceInternal.EventHandler { if(_readStream.isEmpty()) { - _readStream.resize(IceInternal.Protocol.headerSize, true); + _readStream.resize(IceInternal.Protocol.headerSize); _readStream.pos(0); } @@ -2058,7 +2058,7 @@ public final class ConnectionI extends IceInternal.EventHandler _writeStream.resize(0); _writeStream.pos(0); - _readStream.resize(IceInternal.Protocol.headerSize, true); + _readStream.resize(IceInternal.Protocol.headerSize); _readStream.pos(0); _readHeader = true; @@ -2358,7 +2358,7 @@ public final class ConnectionI extends IceInternal.EventHandler assert (_state > StateNotValidated && _state < StateClosed); _readStream.swap(info.stream); - _readStream.resize(IceInternal.Protocol.headerSize, true); + _readStream.resize(IceInternal.Protocol.headerSize); _readStream.pos(0); _readHeader = true; diff --git a/java/src/Ice/src/main/java/Ice/InputStream.java b/java/src/Ice/src/main/java/Ice/InputStream.java index 59f8e294d9c..3427cb69e4e 100644 --- a/java/src/Ice/src/main/java/Ice/InputStream.java +++ b/java/src/Ice/src/main/java/Ice/InputStream.java @@ -484,9 +484,9 @@ public class InputStream * * @param sz The new size. **/ - public void resize(int sz, boolean reading) + public void resize(int sz) { - _buf.resize(sz, reading); + _buf.resize(sz, true); _buf.b.position(sz); } diff --git a/java/src/Ice/src/main/java/Ice/ObjectHolder.java b/java/src/Ice/src/main/java/Ice/ObjectHolder.java index 6181b44c5ff..851bb161841 100644 --- a/java/src/Ice/src/main/java/Ice/ObjectHolder.java +++ b/java/src/Ice/src/main/java/Ice/ObjectHolder.java @@ -17,16 +17,14 @@ public final class ObjectHolder extends ObjectHolderBase<Ice.Object> /** * Instantiates the class with a <code>null</code> value. **/ - public - ObjectHolder() + public ObjectHolder() { } /** * Instantiates the class with the passed Ice object. **/ - public - ObjectHolder(Ice.Object value) + public ObjectHolder(Ice.Object value) { super(value); } @@ -36,22 +34,8 @@ public final class ObjectHolder extends ObjectHolderBase<Ice.Object> * * @param v The new object for this holder. **/ - public void - objectReady(Ice.Object v) + public void objectReady(Ice.Object v) { value = v; } - - /** - * Returns the Slice type ID of the most-derived Slice type supported - * by this instance. - * - * @return The Slice type ID. - **/ - // TBD: Remove - public String - type() - { - return Ice.ObjectImpl.ice_staticId(); - } } |