diff options
author | Matthew Newhook <matthew@zeroc.com> | 2008-03-06 14:26:07 +0800 |
---|---|---|
committer | Matthew Newhook <matthew@zeroc.com> | 2008-03-06 14:26:07 +0800 |
commit | bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6 (patch) | |
tree | dc10cb41cd1280cf115c6bf5a1302481a969e15d /cpp/demo/Ice/value/Client.cpp | |
parent | Fix to fix for 2395. Backed out Dwayne's previous change because we both work... (diff) | |
download | ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.tar.bz2 ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.tar.xz ice-bc6cdac7eda5e31c8fab6e891a7dc2078a7d22c6.zip |
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.
Diffstat (limited to 'cpp/demo/Ice/value/Client.cpp')
-rw-r--r-- | cpp/demo/Ice/value/Client.cpp | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp index 3b0daf52ce1..c30ca2b6d26 100644 --- a/cpp/demo/Ice/value/Client.cpp +++ b/cpp/demo/Ice/value/Client.cpp @@ -18,8 +18,8 @@ class ValueClient : public Ice::Application { public: + ValueClient(); 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"); } +ValueClient::ValueClient() : + // + // Since this is an interactive demo we don't want any signal + // handling. + // + Application(Ice::NoSignalHandling) +{ +} + int ValueClient::run(int argc, char* argv[]) { @@ -38,14 +47,7 @@ ValueClient::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(); - - Ice::ObjectPrx base = communicator()->propertyToProxy("Value.Initial"); - InitialPrx initial = InitialPrx::checkedCast(base); + InitialPrx initial = InitialPrx::checkedCast(communicator()->propertyToProxy("Initial.Proxy")); if(!initial) { cerr << argv[0] << ": invalid object reference" << endl; @@ -187,21 +189,3 @@ ValueClient::run(int argc, char* argv[]) return EXIT_SUCCESS; } - -void -ValueClient::interruptCallback(int) -{ - try - { - communicator()->destroy(); - } - catch(const IceUtil::Exception& ex) - { - cerr << appName() << ": " << ex << endl; - } - catch(...) - { - cerr << appName() << ": unknown exception" << endl; - } - exit(EXIT_SUCCESS); -} |