Tag: cws_src680_dba201b User: oj Date: 05/07/26 03:48:22 Modified: /dba/dbaccess/source/core/api/ CacheSet.cxx, RowSet.cxx
Log: #i52440# throw exception when only select is allowed and an update or insert is executing File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: CacheSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/CacheSet.cxx?r1=1.38.58.1&r2=1.38.58.2 Delta lines: +3 -3 ------------------- --- CacheSet.cxx 11 Jul 2005 13:36:58 -0000 1.38.58.1 +++ CacheSet.cxx 26 Jul 2005 10:48:19 -0000 1.38.58.2 @@ -2,9 +2,9 @@ * * $RCSfile: CacheSet.cxx,v $ * - * $Revision: 1.38.58.1 $ + * $Revision: 1.38.58.2 $ * - * last change: $Author: fs $ $Date: 2005/07/11 13:36:58 $ + * last change: $Author: oj $ $Date: 2005/07/26 10:48:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -206,7 +206,7 @@ void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable) throw(SQLException, RuntimeException) { OSL_ENSURE(_xTable.is(),"OCacheSet::fillTableName: PropertySet is empty!"); - if(!m_aComposedTableName.getLength()) + if(!m_aComposedTableName.getLength() && _xTable.is() ) { Reference<XDatabaseMetaData> xMeta(m_xConnection->getMetaData()); composeTableName(xMeta File [changed]: RowSet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSet.cxx?r1=1.133&r2=1.133.44.1 Delta lines: +7 -4 ------------------- --- RowSet.cxx 10 Mar 2005 16:30:55 -0000 1.133 +++ RowSet.cxx 26 Jul 2005 10:48:19 -0000 1.133.44.1 @@ -2,9 +2,9 @@ * * $RCSfile: RowSet.cxx,v $ * - * $Revision: 1.133 $ + * $Revision: 1.133.44.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 16:30:55 $ + * last change: $Author: oj $ $Date: 2005/07/26 10:48:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1088,7 +1088,7 @@ ::connectivity::checkDisposed(ORowSet_BASE1::rBHelper.bDisposed); // not allowed when standing on insert row ::osl::ResettableMutexGuard aGuard( *m_pMutex ); - if(!m_pCache || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY || m_bNew) + if ( !m_pCache || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY || m_bNew || ((m_pCache->m_nPrivileges & Privilege::INSERT ) != Privilege::INSERT) ) throwFunctionSequenceException(*this); if(m_bModified) @@ -1290,6 +1290,9 @@ ::osl::ResettableMutexGuard aGuard( *m_pMutex ); checkPositioningAllowed(); + if ((m_pCache->m_nPrivileges & Privilege::INSERT ) != Privilege::INSERT) + throwFunctionSequenceException(*this); + if(notifyAllListenersCursorBeforeMove(aGuard)) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
