Cleanup. Apply autorelease pool properly.

1 files changed, 12 insertions, 2 deletions

diff --git a/src/java/native/com_libmailcore_IMAPFetchMessagesOperation.cpp b/src/java/native/com_libmailcore_IMAPFetchMessagesOperation.cpp
index 735459a4..b0f2fe46 100644
--- a/src/java/native/com_libmailcore_IMAPFetchMessagesOperation.cpp
+++ b/src/java/native/com_libmailcore_IMAPFetchMessagesOperation.cpp
@@ -14,26 +14,35 @@ using namespace mailcore;
 JNIEXPORT jobject JNICALL Java_com_libmailcore_IMAPFetchMessagesOperation_messages
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET(messages);
+    MC_POOL_BEGIN;
+    jobject result = MC_JAVA_BRIDGE_GET(messages);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_IMAPFetchMessagesOperation_vanishedMessages
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET(vanishedMessages);
+    MC_POOL_BEGIN;
+    jobject result = MC_JAVA_BRIDGE_GET(vanishedMessages);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT void JNICALL Java_com_libmailcore_IMAPFetchMessagesOperation_finalizeNative
   (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
     JavaIMAPOperationCallback * callback = (JavaIMAPOperationCallback *) MC_JAVA_NATIVE_INSTANCE->imapCallback();
     MC_SAFE_RELEASE(callback);
     MC_JAVA_NATIVE_INSTANCE->setImapCallback(NULL);
+    MC_POOL_END;
 }
 
 JNIEXPORT void JNICALL Java_com_libmailcore_IMAPFetchMessagesOperation_setupNativeOperationProgressListener
   (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
     JavaIMAPOperationCallback * callback = (JavaIMAPOperationCallback *) MC_JAVA_NATIVE_INSTANCE->imapCallback();
     MC_SAFE_RELEASE(callback);
     MC_JAVA_NATIVE_INSTANCE->setImapCallback(NULL);
@@ -43,6 +52,7 @@ JNIEXPORT void JNICALL Java_com_libmailcore_IMAPFetchMessagesOperation_setupNati
         callback = new JavaIMAPOperationCallback(env, javaListener);
         MC_JAVA_NATIVE_INSTANCE->setImapCallback(callback);
     }
+    MC_POOL_END;
 }
 
 MC_JAVA_BRIDGE