Bug 3940 - C# minimal demo is not minimal

1 files changed, 7 insertions, 31 deletions

diff --git a/java/demo/Ice/minimal/Server.java b/java/demo/Ice/minimal/Server.java
index 240f3caed6c..6002adc24ab 100644
--- a/java/demo/Ice/minimal/Server.java
+++ b/java/demo/Ice/minimal/Server.java
@@ -11,46 +11,22 @@ import Demo.*;
 
 public class Server
 {
-    public static int
-    run(String[] args, Ice.Communicator communicator)
-    {
-        Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("Hello", "tcp -p 10000");
-        adapter.add(new HelloI(), communicator.stringToIdentity("hello"));
-        adapter.activate();
-        communicator.waitForShutdown();
-        return 0;
-    }
-
     public static void
     main(String[] args)
     {
-        int status = 0;
-        Ice.Communicator communicator = null;
-
         try
         {
-            communicator = Ice.Util.initialize(args);
-            status = run(args, communicator);
+            Ice.Communicator communicator = Ice.Util.initialize();
+            Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("Hello", "tcp -p 10000");
+            adapter.add(new HelloI(), communicator.stringToIdentity("hello"));
+            adapter.activate();
+            communicator.waitForShutdown();
+            communicator.destroy();
         }
         catch(Ice.LocalException ex)
         {
             ex.printStackTrace();
-            status = 1;
-        }
-
-        if(communicator != null)
-        {
-            try
-            {
-                communicator.destroy();
-            }
-            catch(Ice.LocalException ex)
-            {
-                ex.printStackTrace();
-                status = 1;
-            }
+            System.exit(1);
         }
-        
-        System.exit(status);
     }
 }