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

1 files changed, 11 insertions, 26 deletions

diff --git a/cpp/demo/IceGrid/replication/Client.cpp b/cpp/demo/IceGrid/replication/Client.cpp
index 882bf9eebfe..bba0c55ceb8 100644
--- a/cpp/demo/IceGrid/replication/Client.cpp
+++ b/cpp/demo/IceGrid/replication/Client.cpp
@@ -9,7 +9,7 @@
 
 #include <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/IceGrid.h>
 #include <Hello.h>
 
 using namespace std;
@@ -19,8 +19,8 @@ class HelloClient : public Ice::Application
 {
 public:
 
+    HelloClient();
     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");
 }
 
+HelloClient::HelloClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 HelloClient::run(int argc, char* argv[])
 {
@@ -44,12 +53,6 @@ HelloClient::run(int argc, char* argv[])
     }
 
     //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
-    //
-    callbackOnInterrupt();
-
-    //
     // Get the hello proxy. We configure the proxy to not cache the
     // server connection with the proxy and to disable the locator
     // cache. With this configuration, the IceGrid locator will be
@@ -92,21 +95,3 @@ HelloClient::run(int argc, char* argv[])
 
     return EXIT_SUCCESS;
 }
-
-void
-HelloClient::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}