User: kz Date: 05/01/21 09:03:57 Modified: /dba/dbaccess/source/core/dataaccess/ datasource.cxx
Log: INTEGRATION: CWS dba22 (1.51.8); FILE MERGED 2005/01/11 07:26:31 oj 1.51.8.3: #i39123# commit embedded storage 2005/01/07 07:49:55 oj 1.51.8.2: RESYNC: (1.51-1.52); FILE MERGED 2004/12/30 14:25:19 fs 1.51.8.1: don't throw exceptions without message File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: datasource.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.cxx?r1=1.52&r2=1.53 Delta lines: +6 -20 -------------------- --- datasource.cxx 3 Dec 2004 14:34:21 -0000 1.52 +++ datasource.cxx 21 Jan 2005 17:03:54 -0000 1.53 @@ -678,12 +678,11 @@ *i = OWeakConnection(); try { - TStorages::iterator aFind = m_aStorages.find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("database"))); - if ( aFind != m_aStorages.end() ) - { - Reference<XTransactedObject> xTrans(aFind->second,UNO_QUERY); + Reference<XTransactedObject> xTrans(xCon,UNO_QUERY); if ( bStore = xTrans.is() ) + { xTrans->commit(); + bStore = commitEmbeddedStorage(); } } catch(Exception&) @@ -818,20 +817,7 @@ m_xCurrentController = NULL; m_xNumberFormatsSupplier = NULL; - try - { - TStorages::iterator aFind = m_aStorages.find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("database"))); - if ( aFind != m_aStorages.end() ) - { - Reference<XTransactedObject> xTrans(aFind->second,UNO_QUERY); - if ( xTrans.is() ) - xTrans->commit(); - } - } - catch(Exception&) - { - OSL_ENSURE(0,"Exception Caught: Could not store embedded database!"); - } + try { TStorages::iterator aIter = m_aStorages.begin(); @@ -941,7 +927,7 @@ ::rtl::OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId ); SQLContext aContext; - aContext.Details = m_sConnectURL; + aContext.Message = m_sConnectURL; throwGenericSQLException( sMessage, static_cast< XDataSource* >( this ), makeAny( aContext ) ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
