From 4a7099b9833dda9e7ba9908da27a9032c95f38b0 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 29 Jul 2016 16:24:08 +0200
Subject: [PATCH] Fix merge issue

---
 coreapi/linphonecore_jni.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index d907c76fc..a7f9ddb2e 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -7658,6 +7658,13 @@ JNIEXPORT void JNICALL Java_org_linphone_core_LinphoneNatPolicyImpl_setStunServe
 // XML RPC wrapper
 
 static void xml_request_response(LinphoneXmlRpcRequest *request) {
+	JNIEnv *env = 0;
+	jint result = jvm->AttachCurrentThread(&env,NULL);
+	if (result != 0) {
+		ms_error("cannot attach VM\n");
+		return;
+	}
+	
 	LinphoneXmlRpcRequestCbs *cbs = linphone_xml_rpc_request_get_callbacks(request);
 	jobject listener = (jobject) linphone_xml_rpc_request_cbs_get_user_data(cbs);
 	if (listener == NULL) {