Fixed bug 4488 - hang if multicast fails

1 files changed, 18 insertions, 4 deletions

diff --git a/java/test/Ice/udp/Server.java b/java/test/Ice/udp/Server.java
index c0549751288..6fb99ce4636 100644
--- a/java/test/Ice/udp/Server.java
+++ b/java/test/Ice/udp/Server.java
@@ -14,12 +14,26 @@ public class Server extends test.Util.Application
     public int run(String[] args)
     {
         Ice.Properties properties = communicator().getProperties();
-        if(args.length == 1 && args[0].equals("1"))
+
+        int port = 12010;
+        try
+        {
+            port += args.length == 1 ? Integer.parseInt(args[0]) : 0;
+        }
+        catch(NumberFormatException ex)
+        {
+        }
+        properties.setProperty("ControlAdapter.Endpoints", "tcp -p " + port);
+        Ice.ObjectAdapter adapter = communicator().createObjectAdapter("ControlAdapter");
+        adapter.add(new TestIntfI(), communicator().stringToIdentity("control"));
+        adapter.activate();
+
+        if(port == 12010)
         {
             properties.setProperty("TestAdapter.Endpoints", "udp -p 12010");
-            Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
-            adapter.add(new TestIntfI(), communicator().stringToIdentity("test"));
-            adapter.activate();
+            Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("TestAdapter");
+            adapter2.add(new TestIntfI(), communicator().stringToIdentity("test"));
+            adapter2.activate();
         }
 
         Ice.ObjectAdapter mcastAdapter = communicator().createObjectAdapter("McastTestAdapter");