diff options
| author | Jose <jose@zeroc.com> | 2015-06-15 20:07:33 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-06-15 20:07:33 +0200 |
| commit | 401cab1f701aa1ddd319c2068c0f802fcc992f5c (patch) | |
| tree | b03d26a350ddabbd55843353fcb09d98f51bd8e9 /java | |
| parent | Don't throw RetryException if the failure occurs during connection establishe... (diff) | |
| download | ice-401cab1f701aa1ddd319c2068c0f802fcc992f5c.tar.bz2 ice-401cab1f701aa1ddd319c2068c0f802fcc992f5c.tar.xz ice-401cab1f701aa1ddd319c2068c0f802fcc992f5c.zip | |
Fix to run browser tests with CSharp servers
Diffstat (limited to 'java')
| -rw-r--r-- | java/test/controller/src/main/java/Test/Common/ControllerServer.java | 2 |
1 files changed, 2 insertions, 0 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 d5ffbd32dee..a44252a3ad9 100644 --- a/java/test/controller/src/main/java/Test/Common/ControllerServer.java +++ b/java/test/controller/src/main/java/Test/Common/ControllerServer.java @@ -47,6 +47,8 @@ public class ControllerServer extends Ice.Application { if(line.matches(Pattern.quote("starting server...") + ".*ok") || line.matches(Pattern.quote("starting serveramd...") + ".*ok") || + line.matches(Pattern.quote("starting servertie...") + ".*ok") || + line.matches(Pattern.quote("starting serveramdtie...") + ".*ok") || line.matches("starting test.*" + Pattern.quote("Server...") + ".*ok")) { synchronized(ServerI.this) |