Index: subversion/bindings/javahl/native/JNIStringHolder.h
===================================================================
--- subversion/bindings/javahl/native/JNIStringHolder.h	(revision 1345120)
+++ subversion/bindings/javahl/native/JNIStringHolder.h	(working copy)
@@ -44,4 +44,18 @@
   jstring m_jtext;
 };
 
+/*
+ * Declare JNIStringHolder variable localname based on jstring named jname and
+ * return ret_val if exception occurs
+ */
+#define SVN_JNI_STRING(localName, jname, ret_val)     \
+JNIStringHolder localName(jname);                     \
+do                                                    \
+  {                                                   \
+  if (JNIUtil::isExceptionThrown())                   \
+    {                                                 \
+      return ret_val;                                 \
+    }                                                 \
+} while (0)
+
 #endif  // JNISTRINGHOLDER_H