summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/Glacier2/callback/Client.cpp5
-rw-r--r--cpp/src/Glacier2Lib/Application.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp
index 6d56adf2765..a999ecbed78 100644
--- a/cpp/demo/Glacier2/callback/Client.cpp
+++ b/cpp/demo/Glacier2/callback/Client.cpp
@@ -46,6 +46,7 @@ menu()
"v: set/reset override context field\n"
"F: set/reset fake category\n"
"s: shutdown server\n"
+ "r: restart the session\n"
"x: exit\n"
"?: help\n";
}
@@ -202,6 +203,10 @@ CallbackClient::runWithSession(int argc, char* argv[])
{
twoway->shutdown();
}
+ else if(c == 'r')
+ {
+ restart()
+ }
else if(c == 'x')
{
// Nothing to do
diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp
index ac5b1dd9f8a..6a228f7a88a 100644
--- a/cpp/src/Glacier2Lib/Application.cpp
+++ b/cpp/src/Glacier2Lib/Application.cpp
@@ -322,7 +322,7 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
catch(...)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": unknow exception ";
+ out << IceInternal::_appName << ": unknown exception";
status = 1;
}