merged from release

Author: vtrifonov

CHANGELOG.md

@@ -1,3 +1,9 @@
+5.2.1
+==
+
+## Bug Fixes
+ - [Breakpoint stop to hit when you have two open tabs and close one(#1247)](https://github.com/NativeScript/android-runtime/issues/1247)
+
 5.2.0
 ==
 
@@ -13,8 +19,6 @@
  - [ClassNotFound exception when calling nested static class with correct argument(#1195)](https://github.com/NativeScript/android-runtime/issues/1195)
  - [If you refresh or close the chrome dev tools window an error will be log in the console (#1202)](https://github.com/NativeScript/android-runtime/issues/1202)
  - [Debug on Android fails when stopped on breakpoint and change in .xml/.css/.html is applied(#1243)](https://github.com/NativeScript/android-runtime/issues/1243)
- - [Breakpoint stop to hit when you have two open tabs and close one(#1247)](https://github.com/NativeScript/android-runtime/issues/1247)
- - [ClassNotFound exception when calling nested static class with correct argument(#1195)](https://github.com/NativeScript/android-runtime/issues/1195)
  - [Upgrade V8 to v7 to fix unstable sort() method(#1176)](https://github.com/NativeScript/android-runtime/issues/1176)
  - [CodeCache option is broken since Android Runtime 4.1.0(#1235)](https://github.com/NativeScript/android-runtime/issues/1235)
  - [Snapshots with ABI splits do not work since Android Runtime 4.1.0(#1234)](https://github.com/NativeScript/android-runtime/issues/1234)

test-app/app/src/main/assets/app/tests/testReleaseNativeCounterpart.js

@@ -25,6 +25,21 @@ describe("Test native counterpart release", function () {
 		expect(errorMessage).toBe("Failed calling toString on a java/lang/Object instance. The JavaScript instance no longer has available Java instance counterpart.");
 	});
 
+	it("Calling the indexer operator on a released native array should throw an exception", function(){
+	    var errorMessage = "";
+
+	    try{
+	        var arr = new java.lang.reflect.Array.newInstance(java.lang.Object.class, 10);
+            global.__releaseNativeCounterpart(arr);
+            arr[1];
+	    } catch(e){
+	        errorMessage = e.message;
+	    }
+
+	    expect(errorMessage).toBe("Failed calling indexer operator on native array. The JavaScript instance no longer has available Java instance counterpart.");
+
+	});
+
     it("Calling release on a non native object should throw exception", function () {
 
         var errorMessage = "";

test-app/app/src/main/java/com/tns/AndroidJsV8Inspector.java

@@ -231,9 +231,22 @@ protected Response serveHttp(IHTTPSession session) {
             return super.serveHttp(session);
         }
 
+        private JsV8InspectorWebSocket webSocket;
+
         @Override
         protected WebSocket openWebSocket(IHTTPSession handshake) {
-            return new JsV8InspectorWebSocket(handshake, currentRuntimeLogger);
+            // close the previous webSocket
+            if(this.webSocket != null) {
+                try {
+                    this.webSocket.close(WebSocketFrame.CloseCode.NormalClosure, "New browser connection is open", false);
+                } catch (IOException ioException) {
+                    if(this.webSocket.getState() != State.CLOSED) {
+                        Log.e("{N}.v8-inspector", "Error closing previous connection", ioException);
+                    }
+                }
+            }
+            this.webSocket = new JsV8InspectorWebSocket(handshake, currentRuntimeLogger);
+            return this.webSocket;
         }
     }
 

test-app/runtime/src/main/cpp/ArrayElementAccessor.cpp

@@ -18,6 +18,8 @@ Local<Value> ArrayElementAccessor::GetArrayElement(Isolate* isolate, const Local
 
     auto arr = objectManager->GetJavaObjectByJsObject(array);
 
+    assertNonNullNativeArray(arr);
+
     Local<Value> value;
     jsize startIndex = index;
     const jsize length = 1;
@@ -85,7 +87,9 @@ void ArrayElementAccessor::SetArrayElement(Isolate* isolate, const Local<Object>
     auto objectManager = runtime->GetObjectManager();
     auto context = isolate->GetCurrentContext();
 
-    auto arr = objectManager->GetJavaObjectByJsObject(array);
+    tns::JniLocalRef arr = objectManager->GetJavaObjectByJsObject(array);
+
+    assertNonNullNativeArray(arr);
 
     const string elementSignature = arraySignature.substr(1);
     jboolean isCopy = false;
@@ -198,3 +202,9 @@ Local<Value> ArrayElementAccessor::ConvertToJsValue(Isolate* isolate, ObjectMana
 
     return jsValue;
 }
+
+void ArrayElementAccessor::assertNonNullNativeArray(tns::JniLocalRef& arrayReference) {
+    if(arrayReference.IsNull()){
+        throw NativeScriptException("Failed calling indexer operator on native array. The JavaScript instance no longer has available Java instance counterpart.");
+    }
+}

test-app/runtime/src/main/cpp/ArrayElementAccessor.h

@@ -15,6 +15,7 @@ class ArrayElementAccessor {
 
     private:
         v8::Local<v8::Value> ConvertToJsValue(v8::Isolate* isolate, ObjectManager* objectManager, JEnv& env, const std::string& elementSignature, const void* value);
+        void assertNonNullNativeArray(tns::JniLocalRef& arrayReference);
 };
 }