1 files changed, 40 insertions, 10 deletions
diff --git a/src/java/native/com_libmailcore_Address.cpp b/src/java/native/com_libmailcore_Address.cpp
index f1d49d48..22efbfd2 100644
--- a/src/java/native/com_libmailcore_Address.cpp
+++ b/src/java/native/com_libmailcore_Address.cpp
@@ -13,50 +13,74 @@ using namespace mailcore;
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Address_addressWithDisplayName
   (JNIEnv * env, jclass cls, jstring displayName, jstring mailbox)
 {
-    return MC_TO_JAVA(Address::addressWithDisplayName(MC_FROM_JAVA(String, displayName),
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Address::addressWithDisplayName(MC_FROM_JAVA(String, displayName),
         MC_FROM_JAVA(String, mailbox)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Address_addressWithMailbox
   (JNIEnv * env, jclass cls, jstring mailbox)
 {
-    return MC_TO_JAVA(Address::addressWithMailbox(MC_FROM_JAVA(String, mailbox)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Address::addressWithMailbox(MC_FROM_JAVA(String, mailbox)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Address_addressWithRFC822String
   (JNIEnv * env, jclass cls, jstring rfc822String)
 {
-    return MC_TO_JAVA(Address::addressWithRFC822String(MC_FROM_JAVA(String, rfc822String)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Address::addressWithRFC822String(MC_FROM_JAVA(String, rfc822String)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Address_addressWithNonEncodedRFC822String
   (JNIEnv * env, jclass cls, jstring rfc822String)
 {
-    return MC_TO_JAVA(Address::addressWithNonEncodedRFC822String(MC_FROM_JAVA(String, rfc822String)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Address::addressWithNonEncodedRFC822String(MC_FROM_JAVA(String, rfc822String)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Address_addressesWithRFC822String
   (JNIEnv * env, jclass cls, jstring rfc822String)
 {
-    return MC_TO_JAVA(Address::addressesWithRFC822String(MC_FROM_JAVA(String, rfc822String)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Address::addressesWithRFC822String(MC_FROM_JAVA(String, rfc822String)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Address_addressesWithNonEncodedRFC822String
   (JNIEnv * env, jclass cls, jstring rfc822String)
 {
-    return MC_TO_JAVA(Address::addressesWithNonEncodedRFC822String(MC_FROM_JAVA(String, rfc822String)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(Address::addressesWithNonEncodedRFC822String(MC_FROM_JAVA(String, rfc822String)));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_Address_RFC822StringForAddresses
   (JNIEnv * env, jclass cls, jobject addresses)
 {
-    return (jstring) MC_TO_JAVA(Address::RFC822StringForAddresses(MC_FROM_JAVA(Array, addresses)));
+    MC_POOL_BEGIN;
+    jobject result = (jstring) MC_TO_JAVA(Address::RFC822StringForAddresses(MC_FROM_JAVA(Array, addresses)));
+    MC_POOL_END;
+    return (jstring) result;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_Address_nonEncodedRFC822StringForAddresses
   (JNIEnv * env, jclass cls, jobject addresses)
 {
-    return (jstring) MC_TO_JAVA(Address::nonEncodedRFC822StringForAddresses(MC_FROM_JAVA(Array, addresses)));
+    MC_POOL_BEGIN;
+    jobject result = (jstring) MC_TO_JAVA(Address::nonEncodedRFC822StringForAddresses(MC_FROM_JAVA(Array, addresses)));
+    MC_POOL_END;
+    return (jstring) result;
 }
 
 MC_JAVA_SYNTHESIZE_STRING(setDisplayName, displayName)
@@ -65,13 +89,19 @@ MC_JAVA_SYNTHESIZE_STRING(setMailbox, mailbox)
 JNIEXPORT jstring JNICALL Java_com_libmailcore_Address_RFC822String
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET_STRING(RFC822String);
+    MC_POOL_BEGIN;
+    jstring result = MC_JAVA_BRIDGE_GET_STRING(RFC822String);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_Address_nonEncodedRFC822String
   (JNIEnv * env, jobject obj)
 {
-    return MC_JAVA_BRIDGE_GET_STRING(nonEncodedRFC822String);
+    MC_POOL_BEGIN;
+    jstring result = MC_JAVA_BRIDGE_GET_STRING(nonEncodedRFC822String);
+    MC_POOL_END;
+    return result;
 }
 
 MC_JAVA_BRIDGE