1 files changed, 24 insertions, 4 deletions
diff --git a/src/java/native/com_libmailcore_MessageParser.cpp b/src/java/native/com_libmailcore_MessageParser.cpp
index 8bdec7fd..038b219d 100644
--- a/src/java/native/com_libmailcore_MessageParser.cpp
+++ b/src/java/native/com_libmailcore_MessageParser.cpp
@@ -14,30 +14,43 @@ using namespace mailcore;
 JNIEXPORT jobject JNICALL Java_com_libmailcore_MessageParser_messageParserWithData
   (JNIEnv * env, jclass cls, jbyteArray data)
 {
-    return MC_TO_JAVA(MessageParser::messageParserWithData(MC_FROM_JAVA(Data, data)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MessageParser::messageParserWithData(MC_FROM_JAVA(Data, data)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_MessageParser_messageParserWithContentsOfFile
   (JNIEnv * env, jclass cls, jstring filename)
 {
-    return MC_TO_JAVA(MessageParser::messageParserWithContentsOfFile(MC_FROM_JAVA(String, filename)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MessageParser::messageParserWithContentsOfFile(MC_FROM_JAVA(String, filename)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_MessageParser_mainPart
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET(mainPart);
+    MC_POOL_BEGIN;
+    jobject result = MC_JAVA_BRIDGE_GET(mainPart);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jbyteArray JNICALL Java_com_libmailcore_MessageParser_data
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET_DATA(data);
+    MC_POOL_BEGIN;
+    jbyteArray result = MC_JAVA_BRIDGE_GET_DATA(data);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_MessageParser_htmlRendering
   (JNIEnv * env, jobject obj, jobject javaCallback)
 {
+    MC_POOL_BEGIN;
     JavaHTMLRendererTemplateCallback * callback = NULL;
     if (javaCallback != NULL) {
         callback = new JavaHTMLRendererTemplateCallback(env, javaCallback);
@@ -46,25 +59,32 @@ JNIEXPORT jstring JNICALL Java_com_libmailcore_MessageParser_htmlRendering
     if (callback != NULL) {
         delete callback;
     }
+    MC_POOL_END;
     return result;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_MessageParser_htmlBodyRendering
   (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
     return MC_JAVA_BRIDGE_GET_STRING(htmlBodyRendering);
+    MC_POOL_END;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_MessageParser_plainTextRendering
   (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
     return MC_JAVA_BRIDGE_GET_STRING(plainTextRendering);
+    MC_POOL_END;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_MessageParser_plainTextBodyRendering
   (JNIEnv * env, jobject obj, jboolean stripWhitespace)
 {
+    MC_POOL_BEGIN;
     return (jstring) MC_TO_JAVA(MC_JAVA_NATIVE_INSTANCE->plainTextBodyRendering((bool) stripWhitespace));
+    MC_POOL_END;
 }
 
 MC_JAVA_BRIDGE