Merge pull request #1415 from varumugam123/master

Fix broken addListener() & delListener() handling.

remote/rtRemoteFunction.cpp

@@ -27,8 +27,10 @@ rtRemoteFunction::rtRemoteFunction(std::string const& id, std::string const& nam
   , m_name(name)
   , m_client(client)
   , m_timeout(client->getEnvironment()->Config->environment_request_timeout())
-  , m_Hash(0)
 {
+  std::hash<std::string> hashFn;
+  m_Hash = hashFn(name);
+
   if (!strcmp(id.c_str(), "global"))
   {
     m_client->registerKeepAliveForObject(m_name);

remote/rtRemoteValueWriter.cpp

@@ -18,6 +18,7 @@ limitations under the License.
 
 #include "rtRemoteValueWriter.h"
 #include "rtRemoteObject.h"
+#include "rtRemoteFunction.h"
 #include "rtRemoteObjectCache.h"
 #include "rtRemoteConfig.h"
 #include "rtRemoteMessage.h"
@@ -32,14 +33,26 @@ namespace
 {
 //  static std::atomic<int> sNextFunctionId;
 
-  std::string getId(rtFunctionRef const& /*ref*/)
+  std::string getId(rtFunctionRef const& ref)
   {
-    rtGuid id = rtGuid::newRandom();
+    rtFunctionCallback * obj = dynamic_cast<rtFunctionCallback *>(ref.ptr());
+    if(obj && !obj->getId().empty())
+    {
+      return obj->getId();
+    }
+    else
+    {
+      rtGuid id = rtGuid::newRandom();
 
-    std::stringstream ss;
-    ss << "func://";
-    ss << id.toString();
-    return ss.str();
+      std::stringstream ss;
+      ss << "func://";
+      ss << id.toString();
+
+      if(obj)
+        obj->setId(ss.str());
+
+      return ss.str();
+    }
   }
 
   std::string getId(rtObjectRef const& ref)

src/rtObject.h

@@ -31,6 +31,7 @@
 
 #include <string.h>
 #include <vector>
+#include <string>
 
 // rtIObject and rtIFunction are designed to be an
 // Abstract Binary Interface(ABI)
@@ -632,11 +633,21 @@ class rtFunctionCallback: public rtIFunction
     mContext = NULL;
   }
 
+  void setId(std::string id)
+  {
+    mId = id;
+  }
+
+  std::string getId()
+  {
+    return mId;
+  }
 
 private:  
   rtFunctionCB mCB;
   void* mContext;
   rtAtomic mRefCount;
+  std::string mId;
 };