You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/05/21 17:01:47 UTC
svn commit: r947034 - /subversion/trunk/subversion/bindings/javahl/native/
Author: hwright
Date: Fri May 21 15:01:46 2010
New Revision: 947034
URL: http://svn.apache.org/viewvc?rev=947034&view=rev
Log:
JavaHL: As gstein points out, we don't need to check for exceptions after
deleting local JNI references, a practice we were doing somewhat
inconsistently. So, just stop checking for exceptions in these cases.
[ in subversion/bindings/javahl/native/ ]
* ChangelistCallback.cpp,
ConflictResolverCallback.cpp,
CreateJ.cpp,
SVNAdmin.cpp,
JNIUtil.cpp,
CopySources.cpp,
Outputer.cpp,
org_apache_subversion_javahl_SVNAdmin.cpp,
CommitMessage.cpp,
SVNClient.cpp,
Prompter.cpp,
Array.cpp,
JNIStackElement.cpp,
Inputer.cpp,
LogMessageCallback.cpp,
RevpropTable.cpp,
MessageReceiver.cpp,
ProgressListener.cpp,
NotifyCallback.cpp:
Remove exception check after calls to DeleteLocalRef().
Modified:
subversion/trunk/subversion/bindings/javahl/native/Array.cpp
subversion/trunk/subversion/bindings/javahl/native/ChangelistCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/CommitMessage.cpp
subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
subversion/trunk/subversion/bindings/javahl/native/Inputer.cpp
subversion/trunk/subversion/bindings/javahl/native/JNIStackElement.cpp
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/MessageReceiver.cpp
subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/Outputer.cpp
subversion/trunk/subversion/bindings/javahl/native/ProgressListener.cpp
subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp
subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNAdmin.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/Array.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Array.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Array.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Array.cpp Fri May 21 15:01:46 2010
@@ -39,8 +39,6 @@ Array::~Array()
it < m_objects.end(); ++it)
{
JNIUtil::getEnv()->DeleteLocalRef(*it);
- if (JNIUtil::isExceptionThrown())
- return;
}
JNIUtil::getEnv()->DeleteLocalRef(m_objectArray);
Modified: subversion/trunk/subversion/bindings/javahl/native/ChangelistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ChangelistCallback.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ChangelistCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ChangelistCallback.cpp Fri May 21 15:01:46 2010
@@ -82,8 +82,6 @@ ChangelistCallback::doChangelist(const c
return;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return;
}
jstring jChangelist = JNIUtil::makeJString(changelist);
@@ -99,6 +97,4 @@ ChangelistCallback::doChangelist(const c
return;
env->DeleteLocalRef(jChangelist);
- // We return here regardless of whether an exception is thrown or not,
- // so we do not need to explicitly check for one.
}
Modified: subversion/trunk/subversion/bindings/javahl/native/CommitMessage.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CommitMessage.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CommitMessage.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CommitMessage.cpp Fri May 21 15:01:46 2010
@@ -69,8 +69,6 @@ CommitMessage *CommitMessage::makeCCommi
return NULL;
}
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
// Since the reference is longer needed then the duration of the
// SVNClient.commtMessage, the local reference has to be converted
@@ -127,8 +125,6 @@ CommitMessage::getCommitMessage(const ap
return NULL;
env->DeleteLocalRef(clazz2);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
}
// create a Java CommitItem for each of the passed in commit items
@@ -181,28 +177,15 @@ CommitMessage::getCommitMessage(const ap
// release the tempory Java objects
env->DeleteLocalRef(jpath);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
-
env->DeleteLocalRef(jnodeKind);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
-
env->DeleteLocalRef(jurl);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
-
env->DeleteLocalRef(jcopyUrl);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
// store the Java object into the array
jitems.push_back(jitem);
}
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
// call the Java callback method
jstring jmessage = (jstring)env->CallObjectMethod(m_jcommitMessage,
Modified: subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ConflictResolverCallback.cpp Fri May 21 15:01:46 2010
@@ -66,8 +66,6 @@ ConflictResolverCallback::makeCConflictR
return NULL;
}
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
// Retain a global reference to our Java peer.
jobject myListener = env->NewGlobalRef(jconflictResolver);
Modified: subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp Fri May 21 15:01:46 2010
@@ -124,8 +124,6 @@ CopySources::array(SVN::Pool &pool)
SVN_JNI_ERR(JNIUtil::preprocessPath(src->path, pool.pool()),
NULL);
env->DeleteLocalRef(jpath);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
// Extract source revision from the copy source.
static jmethodID getRevision = 0;
@@ -147,8 +145,6 @@ CopySources::array(SVN::Pool &pool)
memcpy((void *) src->revision, rev.revision(),
sizeof(*src->revision));
env->DeleteLocalRef(jrev);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
// Extract pegRevision from the copy source.
static jmethodID getPegRevision = 0;
@@ -169,15 +165,11 @@ CopySources::array(SVN::Pool &pool)
memcpy((void *) src->peg_revision, pegRev.revision(),
sizeof(*src->peg_revision));
env->DeleteLocalRef(jPegRev);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
APR_ARRAY_PUSH(copySources, svn_client_copy_source_t *) = src;
}
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
return copySources;
}
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Fri May 21 15:01:46 2010
@@ -776,8 +776,6 @@ CreateJ::RevisionRangeList(apr_array_hea
POP_AND_RETURN_NULL;
env->DeleteLocalRef(jrange);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
}
return env->PopLocalFrame(jranges);
@@ -860,12 +858,7 @@ jobject CreateJ::PropertyMap(apr_hash_t
POP_AND_RETURN_NULL;
env->DeleteLocalRef(jpropName);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
-
env->DeleteLocalRef(jpropVal);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
}
return env->PopLocalFrame(map);
@@ -914,8 +907,6 @@ jobject CreateJ::Set(std::vector<jobject
POP_AND_RETURN_NULL;
env->DeleteLocalRef(jthing);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN_NULL;
}
return env->PopLocalFrame(set);
Modified: subversion/trunk/subversion/bindings/javahl/native/Inputer.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Inputer.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Inputer.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Inputer.cpp Fri May 21 15:01:46 2010
@@ -86,8 +86,6 @@ svn_error_t *Inputer::read(void *baton,
return SVN_NO_ERROR;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
}
// Allocate a Java byte array to read the data.
@@ -148,8 +146,6 @@ svn_error_t *Inputer::close(void *baton)
return SVN_NO_ERROR;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
}
// Call the Java object, to close the stream.
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIStackElement.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIStackElement.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIStackElement.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIStackElement.cpp Fri May 21 15:01:46 2010
@@ -71,12 +71,7 @@ JNIStackElement::JNIStackElement(JNIEnv
// Release the Java string.
env->DeleteLocalRef(jlo);
- if (JNIUtil::isJavaExceptionThrown())
- return;
-
env->DeleteLocalRef(jlo);
- if (JNIUtil::isJavaExceptionThrown())
- return;
// Remember the parameter for the exit of the method.
m_clazz = clazz;
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp Fri May 21 15:01:46 2010
@@ -430,14 +430,8 @@ JNIUtil::putErrorsInTrace(svn_error_t *e
stackTrace.push_back(jelement);
env->DeleteLocalRef(stClazz);
- if (isJavaExceptionThrown())
- return;
env->DeleteLocalRef(jdeclClass);
- if (isJavaExceptionThrown())
- return;
env->DeleteLocalRef(jmethodName);
- if (isJavaExceptionThrown())
- return;
env->DeleteLocalRef(jfileName);
}
@@ -809,8 +803,6 @@ jobject JNIUtil::createDate(apr_time_t t
return NULL;
env->DeleteLocalRef(clazz);
- if (isJavaExceptionThrown())
- return NULL;
return ret;
}
Modified: subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp Fri May 21 15:01:46 2010
@@ -147,16 +147,8 @@ LogMessageCallback::singleMessage(svn_lo
jcps.push_back(cp);
env->DeleteLocalRef(jnodeKind);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
-
env->DeleteLocalRef(jpath);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
-
env->DeleteLocalRef(jcopyFromPath);
- if (JNIUtil::isJavaExceptionThrown())
- POP_AND_RETURN(SVN_NO_ERROR);
}
jChangedPaths = CreateJ::Set(jcps);
Modified: subversion/trunk/subversion/bindings/javahl/native/MessageReceiver.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/MessageReceiver.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/MessageReceiver.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/MessageReceiver.cpp Fri May 21 15:01:46 2010
@@ -68,8 +68,6 @@ void MessageReceiver::receiveMessage(con
return;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return;
}
// Convert the message to a Java string.
@@ -84,6 +82,4 @@ void MessageReceiver::receiveMessage(con
// Delete the Java string.
env->DeleteLocalRef(jmsg);
- if (JNIUtil::isJavaExceptionThrown())
- return;
}
Modified: subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/NotifyCallback.cpp Fri May 21 15:01:46 2010
@@ -74,8 +74,6 @@ NotifyCallback *NotifyCallback::makeCNot
return NULL;
}
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
// Make a global reference, because the reference is longer
// needed, than the call.
@@ -131,8 +129,6 @@ NotifyCallback::onNotify(const svn_wc_no
return;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return;
}
jobject jInfo = CreateJ::NotifyInformation(wcNotify);
@@ -144,6 +140,4 @@ NotifyCallback::onNotify(const svn_wc_no
return;
env->DeleteLocalRef(jInfo);
- if (JNIUtil::isJavaExceptionThrown())
- return;
}
Modified: subversion/trunk/subversion/bindings/javahl/native/Outputer.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Outputer.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Outputer.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Outputer.cpp Fri May 21 15:01:46 2010
@@ -91,8 +91,6 @@ svn_error_t *Outputer::write(void *baton
return SVN_NO_ERROR;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
}
// convert the data to a Java byte array
@@ -107,8 +105,6 @@ svn_error_t *Outputer::write(void *baton
return SVN_NO_ERROR;
env->DeleteLocalRef(data);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
// return the number of bytes written
*len = written;
@@ -142,8 +138,6 @@ svn_error_t *Outputer::close(void *baton
return SVN_NO_ERROR;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return SVN_NO_ERROR;
}
// Call the Java object, to close the stream.
Modified: subversion/trunk/subversion/bindings/javahl/native/ProgressListener.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ProgressListener.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ProgressListener.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ProgressListener.cpp Fri May 21 15:01:46 2010
@@ -61,8 +61,6 @@ ProgressListener::makeCProgressListener(
return NULL;
}
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
// Retain a global reference to our Java peer.
jobject myListener = env->NewGlobalRef(jprogressListener);
Modified: subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp Fri May 21 15:01:46 2010
@@ -84,8 +84,6 @@ Prompter *Prompter::makeCPrompter(jobjec
return NULL;
}
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
// Check if PromptUserPassword2 is implemented by the Java object.
jclass clazz2 = env->FindClass(JAVA_PACKAGE"/PromptUserPassword2");
@@ -97,8 +95,6 @@ Prompter *Prompter::makeCPrompter(jobjec
return NULL;
env->DeleteLocalRef(clazz2);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
bool v3 = false;
if (v2)
@@ -113,8 +109,6 @@ Prompter *Prompter::makeCPrompter(jobjec
return NULL;
env->DeleteLocalRef(clazz3);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
}
// Create a new global ref for the Java object, because it is
@@ -150,8 +144,6 @@ jstring Prompter::username()
return NULL;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
}
jstring ret = static_cast<jstring>(env->CallObjectMethod(m_prompter, mid));
@@ -184,8 +176,6 @@ jstring Prompter::password()
return NULL;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return false;
}
jstring ret = static_cast<jstring>(env->CallObjectMethod(m_prompter, mid));
@@ -222,8 +212,6 @@ bool Prompter::askYesNo(const char *real
return false;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return false;
}
// convert the texts to Java strings
@@ -243,12 +231,7 @@ bool Prompter::askYesNo(const char *real
// delete the Java strings
env->DeleteLocalRef(jquestion);
- if (JNIUtil::isJavaExceptionThrown())
- return false;
-
env->DeleteLocalRef(jrealm);
- if (JNIUtil::isJavaExceptionThrown())
- return false;
return ret ? true:false;
}
@@ -277,8 +260,6 @@ const char *Prompter::askQuestion(const
return NULL;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
}
jstring jrealm = JNIUtil::makeJString(realm);
@@ -297,12 +278,7 @@ const char *Prompter::askQuestion(const
return NULL;
env->DeleteLocalRef(jquestion);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
-
env->DeleteLocalRef(jrealm);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
JNIStringHolder answer(janswer);
if (answer != NULL)
@@ -334,8 +310,6 @@ const char *Prompter::askQuestion(const
return NULL;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
}
jstring jrealm = JNIUtil::makeJString(realm);
@@ -353,12 +327,7 @@ const char *Prompter::askQuestion(const
return NULL;
env->DeleteLocalRef(jquestion);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
-
env->DeleteLocalRef(jrealm);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
JNIStringHolder answer(janswer);
if (answer != NULL)
@@ -396,8 +365,6 @@ int Prompter::askTrust(const char *quest
return -1;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return -1;
}
jstring jquestion = JNIUtil::makeJString(question);
if (JNIUtil::isJavaExceptionThrown())
@@ -409,8 +376,6 @@ int Prompter::askTrust(const char *quest
return -1;
env->DeleteLocalRef(jquestion);
- if (JNIUtil::isJavaExceptionThrown())
- return -1;
return ret;
}
@@ -458,8 +423,6 @@ bool Prompter::prompt(const char *realm,
return false;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return false;
}
jstring jrealm = JNIUtil::makeJString(realm);
@@ -477,12 +440,7 @@ bool Prompter::prompt(const char *realm,
return false;
env->DeleteLocalRef(jusername);
- if (JNIUtil::isJavaExceptionThrown())
- return false;
-
env->DeleteLocalRef(jrealm);
- if (JNIUtil::isJavaExceptionThrown())
- return false;
m_maySave = env->CallBooleanMethod(m_prompter, mid2) ? true : false;
if (JNIUtil::isJavaExceptionThrown())
@@ -505,8 +463,6 @@ bool Prompter::prompt(const char *realm,
return false;
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return false;
}
jstring jrealm = JNIUtil::makeJString(realm);
@@ -523,12 +479,7 @@ bool Prompter::prompt(const char *realm,
return false;
env->DeleteLocalRef(jusername);
- if (JNIUtil::isJavaExceptionThrown())
- return false;
-
env->DeleteLocalRef(jrealm);
- if (JNIUtil::isJavaExceptionThrown())
- return false;
if (maySave)
m_maySave = askYesNo(realm, _("May save the answer ?"), true);
Modified: subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp Fri May 21 15:01:46 2010
@@ -124,12 +124,8 @@ RevpropTable::RevpropTable(jobject jrevp
= std::string((const char *)propval);
JNIUtil::getEnv()->DeleteLocalRef(jpropval);
- if (JNIUtil::isExceptionThrown())
- return;
}
JNIUtil::getEnv()->DeleteLocalRef(jkeySet);
- if (JNIUtil::isExceptionThrown())
- return;
}
}
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNAdmin.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNAdmin.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNAdmin.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNAdmin.cpp Fri May 21 15:01:46 2010
@@ -535,8 +535,6 @@ jobject SVNAdmin::lslocks(const char *pa
}
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
return CreateJ::Set(jlocks);
}
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Fri May 21 15:01:46 2010
@@ -807,16 +807,10 @@ SVNClient::getMergeinfo(const char *targ
env->CallVoidMethod(jmergeinfo, addRevisions, jpath, jranges);
env->DeleteLocalRef(jranges);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
env->DeleteLocalRef(jpath);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
}
env->DeleteLocalRef(clazz);
- if (JNIUtil::isJavaExceptionThrown())
- return NULL;
return jmergeinfo;
}
Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp?rev=947034&r1=947033&r2=947034&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNAdmin.cpp Fri May 21 15:01:46 2010
@@ -381,7 +381,6 @@ Java_org_apache_subversion_javahl_SVNAdm
setRevProp(jthis, jpath, jrevision, jlogPropName, jmessage,
!jbypassHooks, !jbypassHooks);
env->DeleteLocalRef(jlogPropName);
- // No need to check for an exception here, because we return anyway
}
JNIEXPORT void JNICALL