1 files changed, 9 insertions, 21 deletions
diff --git a/cpp/demo/book/lifecycle/Client.cpp b/cpp/demo/book/lifecycle/Client.cpp
index c2671146bf8..0f2352cf176 100644
--- a/cpp/demo/book/lifecycle/Client.cpp
+++ b/cpp/demo/book/lifecycle/Client.cpp
@@ -17,12 +17,16 @@ using namespace Filesystem;
 class FilesystemClient : virtual public Ice::Application
 {
 public:
-    virtual int run(int, char * []) {
-        // Since this is an interactive demo we want the custom
-        // interrupt callback to be called when the process is
-        // interrupted.
+    FilesystemClient() :
+        //
+        // Since this is an interactive demo we don't want any signal
+        // handling.
         //
-        callbackOnInterrupt();
+        Application(Ice::NoSignalHandling)
+    {
+    }
+
+    virtual int run(int, char * []) {
 
         // Create a proxy for the root directory
         //
@@ -43,22 +47,6 @@ public:
         ParserPtr p = new Parser(rootDir);
         return p->parse();
     }
-
-    virtual void interruptCallback(int) {
-        try
-        {
-            communicator()->destroy();
-        }
-        catch(const IceUtil::Exception& ex)
-        {
-            cerr << appName() << ": " << ex << endl;
-        }
-        catch(...)
-        {
-            cerr << appName() << ": unknown exception" << endl;
-        }
-        exit(EXIT_SUCCESS);
-    }
 };
 
 int