diff options
| author | Joe George <joe@zeroc.com> | 2016-08-30 10:04:17 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-08-30 10:06:05 -0400 |
| commit | bf65ac0f73b8eed0d8b127fb322e49b66f51656b (patch) | |
| tree | c7cdcb7ece303a428798ef9c0baa1c38d413b8cb /java | |
| parent | ICE-7292 - Fix Ruby build on Windows (diff) | |
| download | ice-bf65ac0f73b8eed0d8b127fb322e49b66f51656b.tar.bz2 ice-bf65ac0f73b8eed0d8b127fb322e49b66f51656b.tar.xz ice-bf65ac0f73b8eed0d8b127fb322e49b66f51656b.zip | |
ICE-7302 - Fix Java Ice/exceptions not using AMDThrowerI
Diffstat (limited to 'java')
| -rw-r--r-- | java/test/src/main/java/test/Ice/exceptions/AMDServer.java | 2 | ||||
| -rw-r--r-- | java/test/src/main/java/test/Ice/exceptions/DummyLogger.java | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/java/test/src/main/java/test/Ice/exceptions/AMDServer.java b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java index 32d5ba99ca8..6850331a9c6 100644 --- a/java/test/src/main/java/test/Ice/exceptions/AMDServer.java +++ b/java/test/src/main/java/test/Ice/exceptions/AMDServer.java @@ -18,7 +18,7 @@ public class AMDServer extends test.Util.Application Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = communicator.createObjectAdapter("TestAdapter2"); Ice.ObjectAdapter adapter3 = communicator.createObjectAdapter("TestAdapter3"); - Ice.Object object = new ThrowerI(); + Ice.Object object = new AMDThrowerI(); adapter.add(object, communicator.stringToIdentity("thrower")); adapter2.add(object, communicator.stringToIdentity("thrower")); adapter3.add(object, communicator.stringToIdentity("thrower")); diff --git a/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java b/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java index 2a946e09eec..e7a8e94bcef 100644 --- a/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java +++ b/java/test/src/main/java/test/Ice/exceptions/DummyLogger.java @@ -31,7 +31,8 @@ public final class DummyLogger implements Ice.Logger warning(String message) { if(!message.contains("test.Ice.exceptions.ThrowerI.throwAssertException") && - !message.contains("test.Ice.exceptions.AMDThrowerI.throwAssertException_async")) + !message.contains("test.Ice.exceptions.AMDThrowerI.throwAssertException_async") && + !message.contains("java.lang.AssertionError")) { _logger.warning(message); } @@ -42,7 +43,8 @@ public final class DummyLogger implements Ice.Logger error(String message) { if(!message.contains("test.Ice.exceptions.ThrowerI.throwAssertException") && - !message.contains("test.Ice.exceptions.AMDThrowerI.throwAssertException_async")) + !message.contains("test.Ice.exceptions.AMDThrowerI.throwAssertException_async") && + !message.contains("java.lang.AssertionError")) { _logger.error(message); } |