Cleanup. Apply autorelease pool properly.

1 files changed, 32 insertions, 8 deletions

diff --git a/src/java/native/com_libmailcore_Range.cpp b/src/java/native/com_libmailcore_Range.cpp
index a1d657b9..7d4b0921 100644
--- a/src/java/native/com_libmailcore_Range.cpp
+++ b/src/java/native/com_libmailcore_Range.cpp
@@ -10,58 +10,82 @@ using namespace mailcore;
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Range_removeRange
   (JNIEnv * env, jobject obj, jobject range)
 {
+    MC_POOL_BEGIN;
     Range mcRange = rangeFromJava(env, obj);
     Range otherRange = rangeFromJava(env, range);
-    return MC_TO_JAVA(RangeRemoveRange(mcRange, otherRange));
+    jobject result = MC_TO_JAVA(RangeRemoveRange(mcRange, otherRange));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Range_union
   (JNIEnv * env, jobject obj, jobject range)
 {
+    MC_POOL_BEGIN;
     Range mcRange = rangeFromJava(env, obj);
     Range otherRange = rangeFromJava(env, range);
-    return MC_TO_JAVA(RangeUnion(mcRange, otherRange));
+    jobject result = MC_TO_JAVA(RangeUnion(mcRange, otherRange));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Range_intersection
   (JNIEnv * env, jobject obj, jobject range)
 {
+    MC_POOL_BEGIN;
     Range mcRange = rangeFromJava(env, obj);
     Range otherRange = rangeFromJava(env, range);
-    return rangeToJava(env, RangeIntersection(mcRange, otherRange));
+    jobject result = rangeToJava(env, RangeIntersection(mcRange, otherRange));
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jboolean JNICALL Java_com_libmailcore_Range_hasIntersection
   (JNIEnv * env, jobject obj, jobject range)
 {
+    MC_POOL_BEGIN;
     Range mcRange = rangeFromJava(env, obj);
     Range otherRange = rangeFromJava(env, range);
-    return (jboolean) RangeHasIntersection(mcRange, otherRange);
+    jboolean result = (jboolean) RangeHasIntersection(mcRange, otherRange);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jlong JNICALL Java_com_libmailcore_Range_leftBound
   (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
     Range mcRange = rangeFromJava(env, obj);
-    return (jlong) RangeLeftBound(mcRange);
+    jlong result = (jlong) RangeLeftBound(mcRange);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jlong JNICALL Java_com_libmailcore_Range_rightBound
   (JNIEnv * env, jobject obj)
 {
+    MC_POOL_BEGIN;
     Range mcRange = rangeFromJava(env, obj);
-    return (jlong) RangeRightBound(mcRange);
+    jlong result = (jlong) RangeRightBound(mcRange);
+    MC_POOL_END;
+    return result;
 }
 
 JNIEXPORT jstring JNICALL Java_com_libmailcore_Range_toString
   (JNIEnv * env, jobject obj)
 {
-    return (jstring) MC_TO_JAVA(RangeToString(rangeFromJava(env, obj)));
+    MC_POOL_BEGIN;
+    jobject result = MC_TO_JAVA(RangeToString(rangeFromJava(env, obj)));
+    MC_POOL_END;
+    return (jstring) result;
 }
 
 JNIEXPORT jobject JNICALL Java_com_libmailcore_Range_rangeWithString
   (JNIEnv * env, jclass cls, jstring rangeString)
 {
+    MC_POOL_BEGIN;
     Range mcRange = RangeFromString(MC_FROM_JAVA(String, rangeString));
-    return rangeToJava(env, mcRange);
+    jobject result = rangeToJava(env, mcRange);
+    MC_POOL_END;
+    return result;
 }