merge with master

Author: Mihail Slavchev

src/jni/ArrayBufferHelper.cpp

@@ -8,14 +8,15 @@
 using namespace v8;
 using namespace tns;
 
-ArrayBufferHelper::ArrayBufferHelper(ObjectManager *objectManager)
-	: m_objectManager(objectManager), m_ByteBufferClass(nullptr), m_isDirectMethodID(nullptr)
+ArrayBufferHelper::ArrayBufferHelper()
+	: m_objectManager(nullptr), m_ByteBufferClass(nullptr), m_isDirectMethodID(nullptr)
 {
 }
 
-void ArrayBufferHelper::CreateConvertFunctions(const Local<Object>& global)
+void ArrayBufferHelper::CreateConvertFunctions(Isolate *isolate, const Local<Object>& global, ObjectManager *objectManager)
 {
-	auto isolate = Isolate::GetCurrent();
+	m_objectManager = objectManager;
+
 	auto extData = External::New(isolate, this);
 	auto fromFunc = FunctionTemplate::New(isolate, CreateFromCallbackStatic, extData)->GetFunction();
 	auto ctx = isolate->GetCurrentContext();

src/jni/ArrayBufferHelper.h

@@ -9,9 +9,9 @@ namespace tns
 	class ArrayBufferHelper
 	{
 		public:
-			ArrayBufferHelper(ObjectManager *objectManager);
+			ArrayBufferHelper();
 
-			void CreateConvertFunctions(const v8::Local<v8::Object>& global);
+			void CreateConvertFunctions(v8::Isolate *isolate, const v8::Local<v8::Object>& global, ObjectManager *objectManager);
 
 		private:
 

src/jni/Runtime.cpp

@@ -438,8 +438,7 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, jstring packageName,
 
 	ArrayHelper::Init(context);
 
-	s_arrayBufferHeper = ArrayBufferHelper(g_objectManager);
-	s_arrayBufferHeper.CreateConvertFunctions(global);
+	m_arrayBufferHelper.CreateConvertFunctions(isolate, global, m_objectManager);
 
 	return isolate;
 }

src/jni/Runtime.h

@@ -6,6 +6,7 @@
 #include "ObjectManager.h"
 #include "SimpleAllocator.h"
 #include "WeakRef.h"
+#include "ArrayBufferHelper.h"
 
 jobject ConvertJsValueToJavaObject(tns::JEnv& env, const v8::Local<v8::Value>& value, int classReturnType);
 
@@ -49,6 +50,8 @@ namespace tns
 
 			ObjectManager *m_objectManager;
 
+			ArrayBufferHelper m_arrayBufferHelper;
+
 			WeakRef m_weakRef;
 
 			static void PrepareExtendFunction(v8::Isolate *isolate, jstring filesPath);