fix issue #382

Author: Mihail Slavchev

src/jni/ObjectManager.cpp

@@ -335,7 +335,7 @@ void ObjectManager::JSObjectWeakCallback(Isolate *isolate, ObjectWeakCallbackSta
 			}
 			else
 			{
-				m_implObjStrong.push_back(PersistentObjectIdPair(po, javaObjectID));
+				m_implObjStrong.insert(make_pair(javaObjectID, po));
 				jsInstanceInfo->IsJavaObjectWeak = true;
 			}
 		}
@@ -495,6 +495,12 @@ void ObjectManager::MarkReachableObjects(Isolate *isolate, const Local<Object>&
 		auto jsInfo = GetJSInstanceInfo(o);
 		if (jsInfo != nullptr)
 		{
+			auto hasImplObject = HasImplObject(isolate, o);
+			if (hasImplObject)
+			{
+				jsInfo->IsJavaObjectWeak = false;
+				m_implObjStrong[jsInfo->JavaObjectID] = nullptr;
+			}
 			o->SetHiddenValue(propName, curGCNumValue);
 		}
 
@@ -628,9 +634,9 @@ void ObjectManager::OnGcFinished(GCType type, GCCallbackFlags flags)
 		auto obj = Local<Object>::New(isolate, *weakObj.po);
 		MarkReachableObjects(isolate, obj);
 	}
-	for (auto strongObj : m_implObjStrong)
+	for (const auto& kv : m_implObjStrong)
 	{
-		auto obj = Local<Object>::New(isolate, *strongObj.po);
+		auto obj = Local<Object>::New(isolate, *kv.second);
 		MarkReachableObjects(isolate, obj);
 	}
 
@@ -681,24 +687,27 @@ void ObjectManager::MakeRegularObjectsWeak(const set<int>& instances, DirectBuff
 	inputBuff.Reset();
 }
 
-void ObjectManager::MakeImplObjectsWeak(const vector<PersistentObjectIdPair>& instances, DirectBuffer& inputBuff)
+void ObjectManager::MakeImplObjectsWeak(const map<int, Persistent<Object>*>& instances, DirectBuffer& inputBuff)
 {
 	jboolean keepAsWeak = JNI_TRUE;
 
-	for (const auto& poIdPair : instances)
+	for (const auto& kv : instances)
 	{
-		int javaObjectId = poIdPair.javaObjectId;
+		if (kv.second != nullptr)
+		{
+			int javaObjectId = kv.first;
 
-		bool success = inputBuff.Write(javaObjectId);
+			bool success = inputBuff.Write(javaObjectId);
 
-		if (!success)
-		{
-			int length = inputBuff.Length();
-			jboolean keepAsWeak = JNI_TRUE;
-			m_env.CallStaticVoidMethod(PlatformClass, MAKE_INSTANCE_WEAK_BATCH_METHOD_ID, (jobject) inputBuff, length, keepAsWeak);
-			inputBuff.Reset();
-			success = inputBuff.Write(javaObjectId);
-			assert(success);
+			if (!success)
+			{
+				int length = inputBuff.Length();
+				jboolean keepAsWeak = JNI_TRUE;
+				m_env.CallStaticVoidMethod(PlatformClass, MAKE_INSTANCE_WEAK_BATCH_METHOD_ID, (jobject) inputBuff, length, keepAsWeak);
+				inputBuff.Reset();
+				success = inputBuff.Write(javaObjectId);
+				assert(success);
+			}
 		}
 	}
 	int size = inputBuff.Size();

src/jni/ObjectManager.h

@@ -135,7 +135,7 @@ namespace tns
 
 			void MakeRegularObjectsWeak(const std::set<int>& instances, DirectBuffer& inputBuff);
 
-			void MakeImplObjectsWeak(const std::vector<PersistentObjectIdPair>& instances, DirectBuffer& inputBuff);
+			void MakeImplObjectsWeak(const std::map<int, v8::Persistent<v8::Object>*>& instances, DirectBuffer& inputBuff);
 
 			void CheckWeakObjectsAreAlive(const std::vector<PersistentObjectIdPair>& instances, DirectBuffer& inputBuff, DirectBuffer& outputBuff);
 
@@ -183,7 +183,7 @@ namespace tns
 
 			std::set<v8::Persistent<v8::Object>*> m_visitedPOs;
 			std::vector<PersistentObjectIdPair> m_implObjWeak;
-			std::vector<PersistentObjectIdPair> m_implObjStrong;
+			std::map<int, v8::Persistent<v8::Object>*> m_implObjStrong;
 
 			volatile int m_currentObjectId;
 

test-app/assets/app/tests/testGC.js

@@ -241,4 +241,27 @@ describe("Tests garbage collection", function () {
 
 		expect(o.x).toBe(123);
 	});
+
+	it("should keep extended instances alive after GC", function () {
+		var C1 = com.tns.tests.Class1.extend({});
+
+		function createObjects(name) {
+			var c1 = new C1();
+
+			var cb1 = new com.tns.tests.Class1.Callback1(name, {
+				getMessage: function() {
+					var msg = c1.getMessage();
+					return msg;
+				}
+			});
+
+			return com.tns.tests.Class1.Class2.printMessageWithDelay(cb1, 5 * 1000);
+		}
+
+		expect(createObjects("Callback452356")).toBe(true);
+		expect(createObjects("Callback417892")).toBe(true);
+
+		gc();
+		java.lang.System.gc();
+	});
 });