diff options
| -rwxr-xr-x | javae/midp/IceInternal/Acceptor.java | 4 | ||||
| -rwxr-xr-x | javae/midp/IceInternal/Transceiver.java | 8 | ||||
| -rw-r--r-- | javae/test/IceE/adapterDeactivation/AllTests.java | 13 | ||||
| -rw-r--r-- | javae/test/IceE/adapterDeactivation/ClientMIDlet.java | 4 | ||||
| -rw-r--r-- | javae/test/IceE/exceptions/DummyLogger.java | 2 |
5 files changed, 20 insertions, 11 deletions
diff --git a/javae/midp/IceInternal/Acceptor.java b/javae/midp/IceInternal/Acceptor.java index d60ec625d01..8f8531c1c4a 100755 --- a/javae/midp/IceInternal/Acceptor.java +++ b/javae/midp/IceInternal/Acceptor.java @@ -82,7 +82,7 @@ class Acceptor if(_traceLevels.network >= 1) { - String s = "accepted tcp connection\n" + Network.toString(incoming); + String s = "accepted tcp connection " + Network.toString(incoming); _logger.trace(_traceLevels.networkCat, s); } @@ -101,7 +101,7 @@ class Acceptor } catch(java.io.IOException ex) { - ip = "127.0.0.1"; + ip = "127.0.0.1"; } } diff --git a/javae/midp/IceInternal/Transceiver.java b/javae/midp/IceInternal/Transceiver.java index 367e8f9564c..31dfd6c8892 100755 --- a/javae/midp/IceInternal/Transceiver.java +++ b/javae/midp/IceInternal/Transceiver.java @@ -164,7 +164,7 @@ final public class Transceiver { if(_traceLevels.network >= 1) { - String s = "closing tcp connection\n" + toString(); + String s = "closing tcp connection " + toString(); _logger.trace(_traceLevels.networkCat, s); } @@ -211,7 +211,7 @@ final public class Transceiver { if(_traceLevels.network >= 2) { - String s = "shutting down tcp connection for reading and writing\n" + toString(); + String s = "shutting down tcp connection for reading and writing " + toString(); _logger.trace(_traceLevels.networkCat, s); } @@ -304,7 +304,7 @@ final public class Transceiver if(_traceLevels.network >= 3) { - String s = "sent " + rem + " of " + buf.limit() + " bytes via tcp\n" + toString(); + String s = "sent " + rem + " of " + buf.limit() + " bytes via tcp " + toString(); _logger.trace(_traceLevels.networkCat, s); } } @@ -389,7 +389,7 @@ final public class Transceiver { if(_traceLevels.network >= 3) { - String s = "received " + ret + " of " + remaining + " bytes via tcp\n" + toString(); + String s = "received " + ret + " of " + remaining + " bytes via tcp " + toString(); _logger.trace(_traceLevels.networkCat, s); } buf.position(pos + ret); diff --git a/javae/test/IceE/adapterDeactivation/AllTests.java b/javae/test/IceE/adapterDeactivation/AllTests.java index 91bc2cf9214..57eea56f8ba 100644 --- a/javae/test/IceE/adapterDeactivation/AllTests.java +++ b/javae/test/IceE/adapterDeactivation/AllTests.java @@ -37,7 +37,6 @@ public class AllTests test(obj != null); test(obj.equals(base)); out.println("ok"); - { out.print("creating/destroying/recreating object adapter... "); out.flush(); @@ -52,9 +51,19 @@ public class AllTests { } adapter.destroy(); - adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999"); + + adapter = communicator.createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9998"); adapter.destroy(); out.println("ok"); + + // + // Resources on J2ME devices aren't always release in a very + // timely manner. We explicitly call for a garbage collection + // with the hope that the KVM will serially release all actual + // resources before continuing with the test to prevent false + // negatives. This seems to work on the Nokia 6230i. + // + System.gc(); } out.print("creating/activating/deactivating object adapter in one operation... "); diff --git a/javae/test/IceE/adapterDeactivation/ClientMIDlet.java b/javae/test/IceE/adapterDeactivation/ClientMIDlet.java index 6843b5abc4c..328ac2a6f45 100644 --- a/javae/test/IceE/adapterDeactivation/ClientMIDlet.java +++ b/javae/test/IceE/adapterDeactivation/ClientMIDlet.java @@ -12,7 +12,7 @@ public class ClientMIDlet extends ClientBase public void updateProperties(Ice.Properties properties) { - String ref = "test:default -h " + _addr.getString() + " -p " + _port.getString() + " -t " + _timeout.getString(); - properties.setProperty("Test.Proxy", ref); + properties.setProperty("Test.Proxy", + "test:default -h " + _addr.getString() + " -p " + _port.getString() + " -t " + _timeout.getString()); } } diff --git a/javae/test/IceE/exceptions/DummyLogger.java b/javae/test/IceE/exceptions/DummyLogger.java index 9b516b0d590..366c4bbd7f3 100644 --- a/javae/test/IceE/exceptions/DummyLogger.java +++ b/javae/test/IceE/exceptions/DummyLogger.java @@ -7,7 +7,7 @@ // // ********************************************************************** -public final class DummyLogger extends Ice.LocalObjectImpl implements Ice.Logger +public final class DummyLogger implements Ice.Logger { public void print(String message) |