Merge branch 'release'

Author: Mihail Slavchev

CHANGELOG.md

@@ -7,7 +7,11 @@
  - [[Proposal] Static binding generator specification. (#363)](https://github.com/NativeScript/android-runtime/issues/363)
  - [Android Runtime Support for older Android versions (#357)](https://github.com/NativeScript/android-runtime/issues/357)
  - [Data Marshalling: Support for typed arrays (#65)](https://github.com/NativeScript/android-runtime/issues/65)
-
+ - [Support Android Widgets](https://github.com/NativeScript/android-runtime/issues/69)
+ - [Add support for caching already compiled JS code](https://github.com/NativeScript/android-runtime/issues/257)
+ - [Additional Intents Crashes app](https://github.com/NativeScript/android-runtime/issues/218)
+ - [Enable Multidex support](https://github.com/NativeScript/android-runtime/issues/344)
+ 
 ## Bug Fixes
 
  - [Wrong object lifecycle management (#382)](https://github.com/NativeScript/android-runtime/issues/382)

src/src/com/tns/NativeScriptHashMap.java

@@ -417,7 +417,8 @@ public V put(K key, V value)
 		int index = hash & (tab.length - 1);
 		for (HashMapEntry<K, V> e = tab[index]; e != null; e = e.next)
 		{
-			if (e.hash == hash && key.equals(e.key))
+			K eKey = e.key;
+			if (eKey == key || (e.hash == hash && key.equals(eKey)))
 			{
 				preModify(e);
 				V oldValue = e.value;
@@ -689,7 +690,8 @@ public V remove(Object key)
 		int index = hash & (tab.length - 1);
 		for (HashMapEntry<K, V> e = tab[index], prev = null; e != null; prev = e, e = e.next)
 		{
-			if (e.hash == hash && key.equals(e.key))
+			K eKey = e.key;
+			if (eKey == key || (e.hash == hash && key.equals(eKey)))
 			{
 				if (prev == null)
 				{

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

@@ -264,4 +264,32 @@ describe("Tests garbage collection", function () {
 		gc();
 		java.lang.System.gc();
 	});
+	
+	it("should properly reintroduce Java object back in a callback", function () {
+		function getTestObject() {
+			return new com.tns.tests.BadEqualsTest(
+				new com.tns.tests.BadEqualsTest.BadEqualsObject(),
+				new com.tns.tests.BadEqualsTest.Callback({
+					onFinish: function(o) {
+						__log(">>o=" + o.toString());
+					}
+				}));
+		}
+
+		var test = getTestObject();
+	
+		// flush LRU cache
+		for (var i=0; i<65536; i++) {
+			new java.lang.Object().hashCode();
+		}
+	
+		gc();
+		java.lang.Runtime.getRuntime().gc();
+		gc();
+		java.lang.Runtime.getRuntime().gc();
+		gc();
+		java.lang.Runtime.getRuntime().gc();
+	
+		test.postCallback();
+	});
 });

test-app/assets/metadata/treeNodeStream.dat

@@ -0,0 +1,33 @@
+package com.tns.tests;
+
+import android.os.Handler;
+import android.os.Looper;
+
+public class BadEqualsTest {
+	public static final class BadEqualsObject {
+		public boolean equals(Object o) {
+			return false;
+		}
+	}
+	
+	public interface Callback {
+		void onFinish(BadEqualsObject obj);
+	}
+	
+	private final BadEqualsObject obj;
+	private final Callback callback;
+	
+	public BadEqualsTest(BadEqualsObject obj, Callback callback) {
+		this.obj = obj;
+		this.callback = callback;
+	}
+	
+	public void postCallback() {
+		new Handler(Looper.getMainLooper()).post(new Runnable() {
+			@Override
+			public void run() {
+				callback.onFinish(obj);
+			}
+		});
+	}
+}