http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1391.

1 files changed, 25 insertions, 0 deletions

diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index cb213a9da87..e979700f651 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -24,6 +24,7 @@ public:
     }
 
     virtual int run(int argc, char* argv[]);
+    virtual void interruptCallback(int);
 
 private:
 
@@ -40,6 +41,12 @@ main(int argc, char* argv[])
 int
 PhoneBookCollocated::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.
+    //
+    userCallbackOnInterrupt();
+
     Ice::PropertiesPtr properties = communicator()->getProperties();
 
     //
@@ -101,3 +108,21 @@ PhoneBookCollocated::run(int argc, char* argv[])
 
     return status;
 }
+
+void
+PhoneBookCollocated::interruptCallback(int)
+{
+    try
+    {
+	communicator()->destroy();
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+	cerr << appName() << ": " << ex << endl;
+    }
+    catch(...)
+    {
+	cerr << appName() << ": unknown exception" << endl;
+    }
+    exit(EXIT_SUCCESS);
+}