Bug 3940 - C# minimal demo is not minimal

1 files changed, 9 insertions, 26 deletions

diff --git a/cpp/demo/Ice/minimal/Client.cpp b/cpp/demo/Ice/minimal/Client.cpp
index 0fb434a1ecf..7ccaa6bdbfd 100644
--- a/cpp/demo/Ice/minimal/Client.cpp
+++ b/cpp/demo/Ice/minimal/Client.cpp
@@ -14,48 +14,31 @@ using namespace std;
 using namespace Demo;
 
 int
-main(int argc, char* argv[])
+main()
 {
-    int status = EXIT_SUCCESS;
     Ice::CommunicatorPtr communicator;
 
     try
     {
-        communicator = Ice::initialize(argc, argv);
-        if(argc > 1)
-        {
-            cerr << argv[0] << ": too many arguments" << endl;
-            return EXIT_FAILURE;
-        }
+        communicator = Ice::initialize();
         HelloPrx hello = HelloPrx::checkedCast(communicator->stringToProxy("hello:tcp -p 10000"));
-        if(!hello)
-        {
-            cerr << argv[0] << ": invalid proxy" << endl;
-            status = EXIT_FAILURE;
-        }
-        else
-        {
-            hello->sayHello();
-        }
+        hello->sayHello();
+        communicator->destroy();
     }
     catch(const Ice::Exception& ex)
     {
         cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
         try
         {
-            communicator->destroy();
+            if(communicator)
+            {
+                communicator->destroy();
+            }
         }
         catch(const Ice::Exception& ex)
         {
             cerr << ex << endl;
-            status = EXIT_FAILURE;
         }
+        exit(1);
     }
-
-    return status;
 }