From 79a359fea1885151a77f83e05eee8d2aa97895ab Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 8 May 2015 09:22:10 +0200 Subject: jboolean-related clean-up Change-Id: Iecd03d0343b9b7c3a8b23b5a1e9654148b94d44c --- connectivity/source/drivers/hsqldb/HStorageAccess.cxx | 2 +- connectivity/source/drivers/hsqldb/HStorageMap.cxx | 6 +++--- connectivity/source/drivers/hsqldb/StorageFileAccess.cxx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'connectivity/source/drivers/hsqldb') diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index e87e68dee571..628aa3093ddc 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -428,7 +428,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst if ( xOut.is() ) { jbyte *buf = env->GetByteArrayElements(buffer,NULL); - if (JNI_FALSE != env->ExceptionCheck()) + if (env->ExceptionCheck()) { env->ExceptionClear(); OSL_FAIL("ExceptionClear"); diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 8e30cfe3697c..64566b136e0e 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -139,7 +139,7 @@ namespace connectivity OUString StorageContainer::jstring2ustring(JNIEnv * env, jstring jstr) { - if (JNI_FALSE != env->ExceptionCheck()) + if (env->ExceptionCheck()) { env->ExceptionClear(); OSL_FAIL("ExceptionClear"); @@ -156,7 +156,7 @@ namespace connectivity env->ReleaseStringChars(jstr,pChar); } - if (JNI_FALSE != env->ExceptionCheck()) + if (env->ExceptionCheck()) { env->ExceptionClear(); OSL_FAIL("ExceptionClear"); @@ -334,7 +334,7 @@ namespace connectivity void StorageContainer::throwJavaException(const Exception& _aException,JNIEnv * env) { - if (JNI_FALSE != env->ExceptionCheck()) + if (env->ExceptionCheck()) env->ExceptionClear(); OString cstr( OUStringToOString(_aException.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index 740fe733ba08..498b39935bfb 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -76,7 +76,7 @@ extern "C" SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_S catch(const Exception& e) { OSL_FAIL("Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement"); - if (JNI_FALSE != env->ExceptionCheck()) + if (env->ExceptionCheck()) env->ExceptionClear(); OString cstr( OUStringToOString(e.Message, RTL_TEXTENCODING_JAVA_UTF8 ) ); OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() ); @@ -109,7 +109,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora } catch(const NoSuchElementException&) { - if (JNI_FALSE != env->ExceptionCheck()) + if (env->ExceptionCheck()) env->ExceptionClear(); } catch(const Exception& e) -- cgit v1.2.3