You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/03/08 02:31:33 UTC
svn commit: r1664940 - in
/subversion/trunk/subversion/bindings/javahl/native: PatchCallback.cpp
ProplistCallback.cpp
Author: rhuijben
Date: Sun Mar 8 01:31:33 2015
New Revision: 1664940
URL: http://svn.apache.org/r1664940
Log:
Following up on r1664938, make a few more callbacks return
JavaHL exceptions wrapped as svn_error_t *.
In case of patch this will make the patch code stop,
instead of continuing the patch without a filter applied.
* subversion/bindings/javahl/native/PatchCallback.cpp
(PatchCallback::singlePatch): Return an error on error.
* subversion/bindings/javahl/native/ProplistCallback.cpp
(ProplistCallback::singlePath): Return an error on error.
Modified:
subversion/trunk/subversion/bindings/javahl/native/PatchCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/ProplistCallback.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/PatchCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/PatchCallback.cpp?rev=1664940&r1=1664939&r2=1664940&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/PatchCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/PatchCallback.cpp Sun Mar 8 01:31:33 2015
@@ -106,7 +106,7 @@ PatchCallback::singlePatch(svn_boolean_t
jboolean jfiltered = env->CallBooleanMethod(m_callback, mid, jcanonPath,
jpatchAbsPath, jrejectAbsPath);
if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
+ POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
*filtered = (jfiltered ? TRUE : FALSE);
Modified: subversion/trunk/subversion/bindings/javahl/native/ProplistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ProplistCallback.cpp?rev=1664940&r1=1664939&r2=1664940&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ProplistCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ProplistCallback.cpp Sun Mar 8 01:31:33 2015
@@ -112,9 +112,7 @@ svn_error_t *ProplistCallback::singlePat
env->CallVoidMethod(m_callback, mid, jpath, jmap);
// We return whether an exception was thrown or not.
- env->PopLocalFrame(NULL);
-
- return SVN_NO_ERROR;
+ POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
}