1 files changed, 32 insertions, 6 deletions
diff --git a/src/java/native/com_libmailcore_SMTPSession.cpp b/src/java/native/com_libmailcore_SMTPSession.cpp
index 80057e5e..0d43014c 100644
--- a/src/java/native/com_libmailcore_SMTPSession.cpp
+++ b/src/java/native/com_libmailcore_SMTPSession.cpp
@@ -26,48 +26,69 @@ MC_JAVA_SYNTHESIZE_SCALAR(jboolean, bool, setUseHeloIPEnabled, useHeloIPEnabled)
 JNIEXPORT jboolean JNICALL Java_com_libmailcore_SMTPSession_isOperationQueueRunning
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET_SCALAR(jboolean, isOperationQueueRunning);
+    MC_POOL_BEGIN;
+    jboolean result = MC_JAVA_BRIDGE_GET_SCALAR(jboolean, isOperationQueueRunning);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT void JNICALL Java_com_libmailcore_SMTPSession_cancelAllOperations
     (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
     MC_JAVA_NATIVE_INSTANCE->cancelAllOperations();
+    MC_POOL_END;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_SMTPSession_loginOperation
     (JNIEnv * env, jobject obj)
 {
-    return MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->loginOperation());
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->loginOperation());
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_SMTPSession_sendMessageOperation___3B
   (JNIEnv * env, jobject obj, jbyteArray data)
 {
-    return MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->sendMessageOperation(MC_FROM_JAVA(Data, data)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->sendMessageOperation(MC_FROM_JAVA(Data, data)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_SMTPSession_sendMessageOperation__Lcom_libmailcore_Address_2Ljava_util_List_2_3B
   (JNIEnv * env, jobject obj, jobject from, jobject recipients, jbyteArray data)
 {
-    return MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->sendMessageOperation(MC_FROM_JAVA(Address, from), MC_FROM_JAVA(Array, recipients), MC_FROM_JAVA(Data, data)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->sendMessageOperation(MC_FROM_JAVA(Address, from), MC_FROM_JAVA(Array, recipients), MC_FROM_JAVA(Data, data)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_SMTPSession_checkAccountOperation
   (JNIEnv * env, jobject obj, jobject address)
 {
-    return MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->checkAccountOperation(MC_FROM_JAVA(Address, address)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->checkAccountOperation(MC_FROM_JAVA(Address, address)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_SMTPSession_noopOperation
   (JNIEnv * env, jobject obj)
 {
-    return MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->noopOperation());
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->noopOperation());
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT void JNICALL Java_com_libmailcore_SMTPSession_finalizeNative
   (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
     JavaOperationQueueCallback * callback = (JavaOperationQueueCallback *) MC_JAVA_NATIVE_INSTANCE->operationQueueCallback();
     MC_SAFE_RELEASE(callback);
     MC_JAVA_NATIVE_INSTANCE->setOperationQueueCallback(NULL);
@@ -75,11 +96,13 @@ JNIEXPORT void JNICALL Java_com_libmailcore_SMTPSession_finalizeNative
     JavaConnectionLogger * logger = (JavaConnectionLogger *) MC_JAVA_NATIVE_INSTANCE->connectionLogger();
     MC_SAFE_RELEASE(logger);
     MC_JAVA_NATIVE_INSTANCE->setConnectionLogger(NULL);
+    MC_POOL_END;
 }
 
 JNIEXPORT void JNICALL Java_com_libmailcore_SMTPSession_setupNativeOperationQueueListener
   (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
     JavaOperationQueueCallback * callback = (JavaOperationQueueCallback *) MC_JAVA_NATIVE_INSTANCE->operationQueueCallback();
     MC_SAFE_RELEASE(callback);
     MC_JAVA_NATIVE_INSTANCE->setOperationQueueCallback(NULL);
@@ -89,11 +112,13 @@ JNIEXPORT void JNICALL Java_com_libmailcore_SMTPSession_setupNativeOperationQueu
         callback = new JavaOperationQueueCallback(env, javaListener);
         MC_JAVA_NATIVE_INSTANCE->setOperationQueueCallback(callback);
     }
+    MC_POOL_END;
 }
 
 JNIEXPORT void JNICALL Java_com_libmailcore_SMTPSession_setupNativeConnectionLogger
   (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
     JavaConnectionLogger * logger = (JavaConnectionLogger *) MC_JAVA_NATIVE_INSTANCE->connectionLogger();
     MC_SAFE_RELEASE(logger);
     MC_JAVA_NATIVE_INSTANCE->setConnectionLogger(NULL);
@@ -103,6 +128,7 @@ JNIEXPORT void JNICALL Java_com_libmailcore_SMTPSession_setupNativeConnectionLog
         logger = new JavaConnectionLogger(env, javaLogger);
         MC_JAVA_NATIVE_INSTANCE->setConnectionLogger(logger);
     }
+    MC_POOL_END;
 }
 
 MC_JAVA_BRIDGE