diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-12-11 16:39:46 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-12-11 16:39:46 -0330 |
| commit | 3a3f1d0d43ffadc2eddc7ae9ec7bbad5b4b9e703 (patch) | |
| tree | 1161b027c7bcd3e1a5509a19b1aaa5334554776d /java/src | |
| parent | Simplify config.admin from previous commit (diff) | |
| download | ice-3a3f1d0d43ffadc2eddc7ae9ec7bbad5b4b9e703.tar.bz2 ice-3a3f1d0d43ffadc2eddc7ae9ec7bbad5b4b9e703.tar.xz ice-3a3f1d0d43ffadc2eddc7ae9ec7bbad5b4b9e703.zip | |
ICE-6149 Android test suite crashes on binding test w/ ws
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java | 2 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/WSTransceiver.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java b/java/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java index 2bb6327f388..571aa77568e 100644 --- a/java/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java +++ b/java/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java @@ -11,7 +11,7 @@ package IceInternal; class FactoryACMMonitor implements ACMMonitor { - class Change + static class Change { Change(Ice.ConnectionI connection, boolean remove) { diff --git a/java/src/Ice/src/main/java/IceInternal/WSTransceiver.java b/java/src/Ice/src/main/java/IceInternal/WSTransceiver.java index facca10cd4b..9a8b8640ce7 100644 --- a/java/src/Ice/src/main/java/IceInternal/WSTransceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/WSTransceiver.java @@ -301,6 +301,8 @@ final class WSTransceiver implements Transceiver @Override public void close() { + // Reallocate the buffer to avoid holding a large amount of memory. + _writeBuffer = new Buffer(false, java.nio.ByteOrder.BIG_ENDIAN); _delegate.close(); _state = StateClosed; } |