!656 fix RemoteObject mem leak--rollbakck

Merge pull request !656 from 马根堂/master

ipc/native/src/jni/source/ohos_rpc_remote_object.cpp

@@ -96,7 +96,7 @@ public:
 private:
     std::mutex mutex_;
     std::u16string descriptor_;
-    wptr<JRemoteObject> cachedObject_;
+    sptr<JRemoteObject> cachedObject_;
 };
 
 /*
@@ -250,7 +250,7 @@ sptr<JRemoteObject> JRemoteObjectHolder::Get(jobject object)
     // so it will not be freed util this reference released.
     sptr<JRemoteObject> remoteObject = nullptr;
     if (cachedObject_ != nullptr) {
-        remoteObject = cachedObject_.promote();
+        remoteObject = cachedObject_;
     }
 
     if (remoteObject == nullptr) {

ipc/native/src/napi_common/include/napi_remote_object_holder.h

@@ -64,7 +64,7 @@ private:
     std::mutex mutex_;
     napi_env env_ = nullptr;
     std::u16string descriptor_;
-    wptr<NAPIRemoteObject> cachedObject_;
+    sptr<NAPIRemoteObject> cachedObject_;
     napi_ref localInterfaceRef_;
     int32_t attachCount_;
 };

ipc/native/src/napi_common/source/napi_remote_object_holder.cpp

@@ -38,7 +38,7 @@ sptr<NAPIRemoteObject> NAPIRemoteObjectHolder::Get(napi_value jsRemoteObject)
     // so it will not be freed util this reference released.
     sptr<NAPIRemoteObject> remoteObject = nullptr;
     if (cachedObject_ != nullptr) {
-        remoteObject = cachedObject_.promote();
+        remoteObject = cachedObject_;
     }
 
     if (remoteObject == nullptr) {