From 92f83d8a59f01712a217a06dc1131ae8ee4c240f Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sat, 25 Oct 2014 15:52:46 +0100
Subject: coverity#706329 Uncaught exception

Change-Id: Ia056948df45ade616dd4c434a4c9d319d48d97f2
---
 connectivity/source/drivers/jdbc/Object.cxx | 10 +++++-----
 connectivity/source/drivers/jdbc/Reader.cxx |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'connectivity')

diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 80faf9e39e2a..24058cf67d1d 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -301,7 +301,7 @@ sal_Int32 java_lang_Object::callIntMethod_ThrowRuntime(const char* _pMethodName,
     obtainMethodId_throwRuntime(t.pEnv, _pMethodName,"()I", _inout_MethodID);
     // call method
     jint out( t.pEnv->CallIntMethod( object, _inout_MethodID ) );
-    isExceptionOccurred(t.pEnv,true);
+    ThrowRuntimeException(t.pEnv, NULL);
     return (sal_Int32)out;
 }
 
@@ -323,7 +323,7 @@ sal_Int32 java_lang_Object::callIntMethodWithIntArg_ThrowRuntime( const char* _p
     obtainMethodId_throwRuntime(t.pEnv, _pMethodName,"(I)I", _inout_MethodID);
     // call method
     jint out( t.pEnv->CallIntMethod( object, _inout_MethodID , _nArgument) );
-    isExceptionOccurred(t.pEnv,true);
+    ThrowRuntimeException(t.pEnv, NULL);
     return (sal_Int32)out;
 }
 
@@ -346,7 +346,7 @@ void java_lang_Object::callVoidMethod_ThrowRuntime( const char* _pMethodName, jm
 
     // call method
     t.pEnv->CallVoidMethod( object, _inout_MethodID );
-    isExceptionOccurred(t.pEnv, true);
+    ThrowRuntimeException(t.pEnv, NULL);
 }
 
 void java_lang_Object::callVoidMethodWithIntArg_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const
@@ -368,7 +368,7 @@ void java_lang_Object::callVoidMethodWithIntArg_ThrowRuntime( const char* _pMeth
 
     // call method
     t.pEnv->CallVoidMethod( object, _inout_MethodID,_nArgument );
-    isExceptionOccurred(t.pEnv, true);
+    ThrowRuntimeException(t.pEnv, NULL);
 }
 
 void java_lang_Object::callVoidMethodWithBoolArg_ThrowSQL( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument ) const
@@ -388,7 +388,7 @@ void java_lang_Object::callVoidMethodWithBoolArg_ThrowRuntime( const char* _pMet
     obtainMethodId_throwRuntime(t.pEnv, _pMethodName,"(Z)V", _inout_MethodID);
     // call method
     t.pEnv->CallVoidMethod( object, _inout_MethodID,int(_nArgument) );
-    isExceptionOccurred(t.pEnv,true);
+    ThrowRuntimeException(t.pEnv, NULL);
 }
 
 OUString java_lang_Object::callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 46e3e1f20ac9..a7cd3698c5a8 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -90,10 +90,10 @@ sal_Int32 SAL_CALL java_io_Reader::readBytes( ::com::sun::star::uno::Sequence< s
         static const char * cMethodName = "read";
         // Java-Call
         static jmethodID mID(NULL);
-        obtainMethodId_throwSQL(t.pEnv, cMethodName,cSignature, mID);
+        obtainMethodId_throwRuntime(t.pEnv, cMethodName,cSignature, mID);
         out = t.pEnv->CallIntMethod( object, mID, pCharArray, 0, nBytesToRead );
         if ( !out )
-            ThrowSQLException(t.pEnv,*this);
+            ThrowRuntimeException(t.pEnv,*this);
         if(out > 0)
         {
             jboolean p = sal_False;
-- 
cgit v1.2.3