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

1 files changed, 11 insertions, 29 deletions

diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp
index 682861d8663..8adfb80a77f 100644
--- a/cpp/demo/Freeze/library/Collocated.cpp
+++ b/cpp/demo/Freeze/library/Collocated.cpp
@@ -18,13 +18,9 @@ class LibraryCollocated : public Ice::Application
 {
 public:
     
-    LibraryCollocated(const string& envName) :
-        _envName(envName)
-    {
-    }
+    LibraryCollocated(const string&);
 
     virtual int run(int argc, char* argv[]);
-    virtual void interruptCallback(int);
 
 private:
 
@@ -38,15 +34,19 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.collocated");
 }
 
-int
-LibraryCollocated::run(int argc, char* argv[])
-{
+LibraryCollocated::LibraryCollocated(const string& envName) :
     //
-    // Since this is an interactive demo we want the custom interrupt
-    // callback to be called when the process is interrupted.
+    // Since this is an interactive demo we don't want any signal
+    // handling.
     //
-    callbackOnInterrupt();
+    Application(Ice::NoSignalHandling),
+    _envName(envName)
+{
+}
 
+int
+LibraryCollocated::run(int argc, char* argv[])
+{
     Ice::PropertiesPtr properties = communicator()->getProperties();
     
     //
@@ -90,21 +90,3 @@ LibraryCollocated::run(int argc, char* argv[])
 
     return status;
 }
-
-void
-LibraryCollocated::interruptCallback(int)
-{
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-    exit(EXIT_SUCCESS);
-}