1 files changed, 18 insertions, 4 deletions

diff --git a/src/java/native/com_libmailcore_NativeObject.cpp b/src/java/native/com_libmailcore_NativeObject.cpp
index afe9a428..2a9ac116 100644
--- a/src/java/native/com_libmailcore_NativeObject.cpp
+++ b/src/java/native/com_libmailcore_NativeObject.cpp
@@ -19,37 +19,51 @@ JNIEXPORT void JNICALL Java_com_libmailcore_NativeObject_initWithNative
 JNIEXPORT void JNICALL Java_com_libmailcore_NativeObject_unsetupNative
   (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
     Object * mcObj = (Object *) getHandle(env, obj);
     MC_SAFE_RELEASE(mcObj);
     setHandle(env, obj, NULL);
+    MC_POOL_END;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_NativeObject_toString
   (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
+    jstring result = NULL;
     Object * mcObj = (Object *) getHandle(env, obj);
     if (mcObj == NULL) {
-        return (jstring) MC_TO_JAVA(MCSTR("<Uninitialized NativeObject>"));
+        result = (jstring) MC_TO_JAVA(MCSTR("<Uninitialized NativeObject>"));
     }
     else {
-        return MC_JAVA_BRIDGE_GET_STRING(description);
+        result = MC_JAVA_BRIDGE_GET_STRING(description);
     }
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_NativeObject_clone
   (JNIEnv * env, jobject obj)
 {
-    return MC_TO_JAVA(MC_FROM_JAVA(Object, obj)->copy()->autorelease());
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(MC_FROM_JAVA(Object, obj)->copy()->autorelease());
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jbyteArray JNICALL Java_com_libmailcore_NativeObject_serializableData
   (JNIEnv * env, jobject obj)
 {
-    return (jbyteArray) MC_TO_JAVA(JSON::objectToJSONData(MC_JAVA_NATIVE_INSTANCE->serializable()));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(JSON::objectToJSONData(MC_JAVA_NATIVE_INSTANCE->serializable()));
+    MC_POOL_END;
+    return (jbyteArray) result;
 }
 
 JNIEXPORT void JNICALL Java_com_libmailcore_NativeObject_importSerializableData
   (JNIEnv * env, jobject obj, jbyteArray data)
 {
+    MC_POOL_BEGIN;
     MC_JAVA_NATIVE_INSTANCE->importSerializable((HashMap *) JSON::objectFromJSONData(MC_FROM_JAVA(Data, data)));
+    MC_POOL_END;
 }