Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice

1 files changed, 11 insertions, 27 deletions

diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index 3b0daf52ce1..c30ca2b6d26 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -18,8 +18,8 @@ class ValueClient : public Ice::Application
 {
 public:
 
+    ValueClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 };
 
 int
@@ -29,6 +29,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+ValueClient::ValueClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 ValueClient::run(int argc, char* argv[])
 {
@@ -38,14 +47,7 @@ ValueClient::run(int argc, char* argv[])
         return EXIT_FAILURE;
     }
 
-    //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
-    Ice::ObjectPrx base = communicator()->propertyToProxy("Value.Initial");
-    InitialPrx initial = InitialPrx::checkedCast(base);
+    InitialPrx initial = InitialPrx::checkedCast(communicator()->propertyToProxy("Initial.Proxy"));
     if(!initial)
     {
         cerr << argv[0] << ": invalid object reference" << endl;
@@ -187,21 +189,3 @@ ValueClient::run(int argc, char* argv[])
 
     return EXIT_SUCCESS;
 }
-
-void
-ValueClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}