diff options
| author | Ocke Janssen <oj@openoffice.org> | 2002-11-27 08:28:19 +0000 |
|---|---|---|
| committer | Ocke Janssen <oj@openoffice.org> | 2002-11-27 08:28:19 +0000 |
| commit | 630b6a19754b7e8dacaca06e32e15d91c38f1445 (patch) | |
| tree | 393d6fdb006faaf3c49d156976052cbed347281c /connectivity/source/drivers/jdbc | |
| parent | 8090a60db3b39df315f78b5cf6f73aa1c0b63402 (diff) | |
#105213# check if en is null
Diffstat (limited to 'connectivity/source/drivers/jdbc')
| -rw-r--r-- | connectivity/source/drivers/jdbc/Object.cxx | 7 | ||||
| -rw-r--r-- | connectivity/source/drivers/jdbc/tools.cxx | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index 23edb7efd7..121eba1884 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Object.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: oj $ $Date: 2002-11-01 10:58:36 $ + * last change: $Author: oj $ $Date: 2002-11-27 09:28:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -170,7 +170,8 @@ int SDB_JRE_InitJava(const Reference<XMultiServiceFactory >& _rxFactory) } catch (Exception& e) { - isExceptionOccured(pEnv,sal_True); + if ( pEnv ) + isExceptionOccured(pEnv,sal_True); result = -1; } diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index c7e79c9344..1eb7202c04 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tools.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: oj $ $Date: 2002-11-01 10:58:36 $ + * last change: $Author: oj $ $Date: 2002-11-27 09:28:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -227,7 +227,9 @@ jobject connectivity::XNameAccess2Map(JNIEnv *pEnv,const Reference< ::com::sun:: // ----------------------------------------------------------------------------- sal_Bool connectivity::isExceptionOccured(JNIEnv *pEnv,sal_Bool _bClear) { - OSL_ENSURE(pEnv,"Java env not valid! Prepare for GPF. For performace reason there is not check for NULL here. :-("); + if ( !pEnv ) + return sal_False; + jthrowable pThrowable = pEnv->ExceptionOccurred(); sal_Bool bRet = pThrowable != NULL; if ( pThrowable ) |