diff options
author | Benoit Foucher <benoit@zeroc.com> | 2014-12-23 09:40:40 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-23 09:40:40 +0100 |
commit | 7429e67d2f7ea0edacc97c1bb5c04c97fa89680d (patch) | |
tree | 3a2ce5c1d1b37f468c7a2854bf96a9c8dd176f4a /java/test | |
parent | ICE-6223 - Fixed icegrid scripts in Ubuntu packages (diff) | |
download | ice-7429e67d2f7ea0edacc97c1bb5c04c97fa89680d.tar.bz2 ice-7429e67d2f7ea0edacc97c1bb5c04c97fa89680d.tar.xz ice-7429e67d2f7ea0edacc97c1bb5c04c97fa89680d.zip |
Fixed ICE-5751 - don't close the connections for retries
Diffstat (limited to 'java/test')
-rw-r--r-- | java/test/src/main/java/test/Ice/retry/RetryI.java | 19 | ||||
-rw-r--r-- | java/test/src/main/java/test/Ice/retry/Server.java | 1 |
2 files changed, 3 insertions, 17 deletions
diff --git a/java/test/src/main/java/test/Ice/retry/RetryI.java b/java/test/src/main/java/test/Ice/retry/RetryI.java index f2afcc881dd..9005b471769 100644 --- a/java/test/src/main/java/test/Ice/retry/RetryI.java +++ b/java/test/src/main/java/test/Ice/retry/RetryI.java @@ -47,15 +47,7 @@ public final class RetryI extends _RetryDisp if(nRetry > _counter) { ++_counter; - if(current.con != null) - { - current.con.close(true); - } - else - { - throw new Ice.ConnectionLostException(); - } - return 0; + throw new Ice.ConnectionLostException(); } int counter = _counter; @@ -67,14 +59,7 @@ public final class RetryI extends _RetryDisp public void opNotIdempotent(Ice.Current current) { - if(current.con != null) - { - current.con.close(true); - } - else - { - throw new Ice.ConnectionLostException(); - } + throw new Ice.ConnectionLostException(); } @Override diff --git a/java/test/src/main/java/test/Ice/retry/Server.java b/java/test/src/main/java/test/Ice/retry/Server.java index a744748958b..fcf71969b47 100644 --- a/java/test/src/main/java/test/Ice/retry/Server.java +++ b/java/test/src/main/java/test/Ice/retry/Server.java @@ -28,6 +28,7 @@ public class Server extends test.Util.Application initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry"); initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); + initData.properties.setProperty("Ice.Warn.Dispatch", "0"); return initData; } |