Replace MethodCallHandler::setCaller() with a parameterized constructor

Change-Id: I082e5f1ff90a5ee4c068fc760661f48e754b601a
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/include/private/ContextStoreService.h b/include/private/ContextStoreService.h
index 96cbfd0..e5619c9 100644 (file)
--- a/include/private/ContextStoreService.h
+++ b/include/private/ContextStoreService.h
@@ -21,6 +21,7 @@
 
 #include <IService.h>
 #include <IServiceRunner.h>
+#include <IClient.h>
 #include <IMethodCallHandler.h>
 
 namespace ctx {
@@ -45,7 +46,7 @@ namespace ctx {
                void onUserActivated();
                void onUserDeactivated();
 
-               IMethodCallHandler* createMethodCallHandler();
+               IMethodCallHandler* createMethodCallHandler(IClient* client);
 
                GMainContext* getMainContext();
 

diff --git a/src/server-dummy/ContextStoreService.cpp b/src/server-dummy/ContextStoreService.cpp
index 06a518a..469fdc4 100644 (file)
--- a/src/server-dummy/ContextStoreService.cpp
+++ b/src/server-dummy/ContextStoreService.cpp
@@ -67,7 +67,7 @@ void ContextStoreService::onUserDeactivated()
 {
 }
 
-IMethodCallHandler* ContextStoreService::createMethodCallHandler()
+IMethodCallHandler* ContextStoreService::createMethodCallHandler(IClient* client)
 {
        return NULL;
 }

diff --git a/src/server/ContextStoreService.cpp b/src/server/ContextStoreService.cpp
index 2f8b4c3..092a0a6 100644 (file)
--- a/src/server/ContextStoreService.cpp
+++ b/src/server/ContextStoreService.cpp
@@ -91,9 +91,9 @@ void ContextStoreService::onUserDeactivated()
                __storeManager->flushUserCache();
 }
 
-IMethodCallHandler* ContextStoreService::createMethodCallHandler()
+IMethodCallHandler* ContextStoreService::createMethodCallHandler(IClient* client)
 {
-       return new MethodCallHandler();
+       return new MethodCallHandler(client);
 }
 
 GMainContext* ContextStoreService::getMainContext()

diff --git a/src/server/MethodCallHandler.cpp b/src/server/MethodCallHandler.cpp
index 0d6595f..a16ddbd 100644 (file)
--- a/src/server/MethodCallHandler.cpp
+++ b/src/server/MethodCallHandler.cpp
@@ -24,8 +24,8 @@
 
 using namespace ctx;
 
-MethodCallHandler::MethodCallHandler() :
-       __caller(NULL)
+MethodCallHandler::MethodCallHandler(IClient* client) :
+       __caller(client)
 {
 }
 
@@ -33,11 +33,6 @@ MethodCallHandler::~MethodCallHandler()
 {
 }
 
-void MethodCallHandler::setCaller(IClient* client)
-{
-       __caller = client;
-}
-
 void MethodCallHandler::onMethodCalled(IMethodCall* methodCall)
 {
        try {

diff --git a/src/server/MethodCallHandler.h b/src/server/MethodCallHandler.h
index f6b861e..ee11ad3 100644 (file)
--- a/src/server/MethodCallHandler.h
+++ b/src/server/MethodCallHandler.h
@@ -28,10 +28,9 @@ namespace ctx {
 
        class MethodCallHandler : public IMethodCallHandler {
        public:
-               MethodCallHandler();
+               MethodCallHandler(IClient* client);
                ~MethodCallHandler();
 
-               void setCaller(IClient* client);
                void onMethodCalled(IMethodCall* methodCall);
                void onDisconnected();