You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/03/25 12:57:38 UTC
svn commit: r1460629 - in
/subversion/trunk/subversion/bindings/javahl/native: CreateJ.cpp
StatusCallback.cpp
Author: philip
Date: Mon Mar 25 11:57:38 2013
New Revision: 1460629
URL: http://svn.apache.org/r1460629
Log:
Fix some NULL/SVN_NO_ERROR mismatch in JavaHL (they are both zero
so not much real change).
* subversion/bindings/javahl/native/CreateJ.cpp
(CreateJ::ChangedPath): Return correct constant.
* subversion/bindings/javahl/native/StatusCallback.cpp
(StatusCallback::doStatus): Return correct constant.
Modified:
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=1460629&r1=1460628&r2=1460629&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Mon Mar 25 11:57:38 2013
@@ -430,7 +430,7 @@ CreateJ::ChangedPath(const char *path, s
jclass clazzCP = env->FindClass(JAVA_PACKAGE"/types/ChangePath");
if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
+ POP_AND_RETURN_NULL;
static jmethodID midCP = 0;
if (midCP == 0)
@@ -443,7 +443,7 @@ CreateJ::ChangedPath(const char *path, s
"L"JAVA_PACKAGE"/types/Tristate;"
"L"JAVA_PACKAGE"/types/Tristate;)V");
if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
+ POP_AND_RETURN_NULL;
}
jstring jpath = JNIUtil::makeJString(path);
Modified: subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp?rev=1460629&r1=1460628&r2=1460629&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/StatusCallback.cpp Mon Mar 25 11:57:38 2013
@@ -94,7 +94,7 @@ StatusCallback::doStatus(const char *loc
jstring jPath = JNIUtil::makeJString(local_abspath);
if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
+ POP_AND_RETURN(SVN_NO_ERROR);
jobject jStatus = CreateJ::Status(wc_ctx, status, pool);
if (JNIUtil::isJavaExceptionThrown())