summaryrefslogtreecommitdiff
path: root/subversion/bindings/javahl/native/StatusCallback.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'subversion/bindings/javahl/native/StatusCallback.cpp')
-rw-r--r--subversion/bindings/javahl/native/StatusCallback.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/subversion/bindings/javahl/native/StatusCallback.cpp b/subversion/bindings/javahl/native/StatusCallback.cpp
index 49a8043..cc0d67a 100644
--- a/subversion/bindings/javahl/native/StatusCallback.cpp
+++ b/subversion/bindings/javahl/native/StatusCallback.cpp
@@ -55,7 +55,8 @@ StatusCallback::callback(void *baton,
apr_pool_t *pool)
{
if (baton)
- return ((StatusCallback *)baton)->doStatus(local_abspath, status, pool);
+ return static_cast<StatusCallback *>(baton)->doStatus(
+ local_abspath, status, pool);
return SVN_NO_ERROR;
}
@@ -93,7 +94,7 @@ StatusCallback::doStatus(const char *local_abspath,
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())