From bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6 Mon Sep 17 00:00:00 2001
From: Matthew Newhook <matthew@zeroc.com>
Date: Thu, 6 Mar 2008 14:26:07 +0800
Subject: Squashed commit of the following:

commit c2f83d9a3e0e1f97e76f33d7992ef8e3e2994d91
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 14:22:52 2008 +0800

    Cleanup some IceGrid configuration files.

commit 4e33903c9ae238b9e317fc3f1f3e281c816374dd
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 14:17:10 2008 +0800

    remove ttl setting.

commit c418b308ff7cc8e8a4296819938b88dfedc16a97
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 14:16:32 2008 +0800

    remove useless PopulateEmptyIndices config.

commit da70d3936f921aa2c92bd2db7b1fcddb4467a9bd
Author: Matthew Newhook <matthew@zeroc.com>
Date:   Thu Mar 6 13:59:51 2008 +0800

    - Removed interrupt handlers for interactive C++ demos.
    - Lots of cleanups to demos.
---
 cpp/demo/Ice/nested/Client.cpp | 43 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 32 deletions(-)

(limited to 'cpp/demo/Ice/nested/Client.cpp')

diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp
index fa91add84c2..f3129a8d7f3 100644
--- a/cpp/demo/Ice/nested/Client.cpp
+++ b/cpp/demo/Ice/nested/Client.cpp
@@ -18,8 +18,8 @@ class NestedClient : public Ice::Application
 {
 public:
 
+    NestedClient();
     virtual int run(int, char*[]);
-    virtual void interruptCallback(int);
 };
 
 int
@@ -29,6 +29,15 @@ main(int argc, char* argv[])
     return app.main(argc, argv, "config.client");
 }
 
+NestedClient::NestedClient() :
+    //
+    // Since this is an interactive demo we don't want any signal
+    // handling.
+    //
+    Application(Ice::NoSignalHandling)
+{
+}
+
 int
 NestedClient::run(int argc, char* argv[])
 {
@@ -38,13 +47,7 @@ NestedClient::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();
-
-    NestedPrx nested = NestedPrx::checkedCast(communicator()->propertyToProxy("Nested.NestedServer"));
+    NestedPrx nested = NestedPrx::checkedCast(communicator()->propertyToProxy("Nested.Proxy"));
     if(!nested)
     {
         cerr << appName() << ": invalid proxy" << endl;
@@ -84,27 +87,3 @@ NestedClient::run(int argc, char* argv[])
 
     return EXIT_SUCCESS;
 }
-
-void
-NestedClient::interruptCallback(int)
-{
-/*
- * For this demo we won't destroy the communicator since it has to
- * wait for any outstanding invocations to complete which may take
- * some time if the nesting level is exceeded.
- *
-    try
-    {
-        communicator()->destroy();
-    }
-    catch(const IceUtil::Exception& ex)
-    {
-        cerr << appName() << ": " << ex << endl;
-    }
-    catch(...)
-    {
-        cerr << appName() << ": unknown exception" << endl;
-    }
-*/
-    exit(EXIT_SUCCESS);
-}
-- 
cgit v1.2.3