diff options
| author | Jose <jose@zeroc.com> | 2016-03-31 10:01:20 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-31 10:01:20 +0200 |
| commit | 6953c452094b9f3dfe1eec3b13faa2eb1837f906 (patch) | |
| tree | bc9554b7a6f677568be294e50169fa7fb5a08210 | |
| parent | Fixed Glacier2 bug which would cause hang on shutdown (diff) | |
| download | ice-6953c452094b9f3dfe1eec3b13faa2eb1837f906.tar.bz2 ice-6953c452094b9f3dfe1eec3b13faa2eb1837f906.tar.xz ice-6953c452094b9f3dfe1eec3b13faa2eb1837f906.zip | |
ICE-7078 - test controller out of memory issue in Windows
| -rw-r--r-- | java/test/controller/src/main/java/Test/Common/ControllerServer.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/test/controller/src/main/java/Test/Common/ControllerServer.java b/java/test/controller/src/main/java/Test/Common/ControllerServer.java index 5e4e9fc938b..baefe018eb7 100644 --- a/java/test/controller/src/main/java/Test/Common/ControllerServer.java +++ b/java/test/controller/src/main/java/Test/Common/ControllerServer.java @@ -70,7 +70,13 @@ public class ControllerServer extends Ice.Application line.matches(Pattern.quote("starting serveramdtie...") + ".*") || line.matches("starting test.*" + Pattern.quote("Server...") + ".*")) { - line += reader.readLine(); + String s = reader.readLine(); + if(s == null) + { + System.out.println(line); + break; + } + line += s; continue; } System.out.println(line); @@ -122,7 +128,6 @@ public class ControllerServer extends Ice.Application { } } - current.adapter.remove(current.id); System.out.println("ok"); } |