got rid of unnecessary _communicator member.

3 files changed, 3 insertions, 14 deletions

diff --git a/cpp/demo/Ice/hello/HelloI.cpp b/cpp/demo/Ice/hello/HelloI.cpp
index bca3a588381..880603c5f46 100644
--- a/cpp/demo/Ice/hello/HelloI.cpp
+++ b/cpp/demo/Ice/hello/HelloI.cpp
@@ -17,11 +17,6 @@
 
 using namespace std;
 
-HelloI::HelloI(const Ice::CommunicatorPtr& communicator) :
-    _communicator(communicator)
-{
-}
-
 void
 HelloI::sayHello(const Ice::Current&) const
 {
@@ -29,8 +24,8 @@ HelloI::sayHello(const Ice::Current&) const
 }
 
 void
-HelloI::shutdown(const Ice::Current&)
+HelloI::shutdown(const Ice::Current& c)
 {
     cout << "Shutting down..." << endl;
-    _communicator->shutdown();
+    c.adapter->getCommunicator()->shutdown();
 }
diff --git a/cpp/demo/Ice/hello/HelloI.h b/cpp/demo/Ice/hello/HelloI.h
index 358944bb5bc..e57da289476 100644
--- a/cpp/demo/Ice/hello/HelloI.h
+++ b/cpp/demo/Ice/hello/HelloI.h
@@ -21,14 +21,8 @@ class HelloI : public Hello
 {
 public:
 
-    HelloI(const Ice::CommunicatorPtr&);
-
     virtual void sayHello(const Ice::Current&) const;
     virtual void shutdown(const Ice::Current&);
-
-private:
-
-    Ice::CommunicatorPtr _communicator;
 };
 
 #endif
diff --git a/cpp/demo/Ice/hello/Server.cpp b/cpp/demo/Ice/hello/Server.cpp
index c77033a22e3..6d50c4ed612 100644
--- a/cpp/demo/Ice/hello/Server.cpp
+++ b/cpp/demo/Ice/hello/Server.cpp
@@ -21,7 +21,7 @@ int
 run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Hello");
-    Ice::ObjectPtr object = new HelloI(communicator);
+    Ice::ObjectPtr object = new HelloI;
     adapter->add(object, Ice::stringToIdentity("hello"));
     adapter->activate();
     communicator->waitForShutdown();