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

1 files changed, 11 insertions, 27 deletions

diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp
index 2d6944014cb..1a3264c50ca 100644
--- a/cpp/demo/Ice/throughput/Client.cpp
+++ b/cpp/demo/Ice/throughput/Client.cpp
@@ -19,8 +19,8 @@ class ThroughputClient : public Ice::Application
 {
 public:
 
+    ThroughputClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -34,6 +34,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+ThroughputClient::ThroughputClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 ThroughputClient::run(int argc, char* argv[])
 {
@@ -43,14 +52,7 @@ ThroughputClient::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("Throughput.Throughput");
-    ThroughputPrx throughput = ThroughputPrx::checkedCast(base);
+    ThroughputPrx throughput = ThroughputPrx::checkedCast(communicator()->propertyToProxy("Throughput.Proxy"));
     if(!throughput)
     {
         cerr << argv[0] << ": invalid proxy" << endl;
@@ -443,24 +445,6 @@ ThroughputClient::run(int argc, char* argv[])
 }
 
 void
-ThroughputClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}
-
-void
 ThroughputClient::menu()
 {
     cout <<