User: obo Date: 05/12/21 05:17:30 Modified: /dba/connectivity/source/drivers/mozab/ MResultSet.hxx
Log: INTEGRATION: CWS dba202a (1.9.36); FILE MERGED 2005/11/24 14:57:32 fs 1.9.36.2: now a proper fix for 126615 - invalid m_pKeySet is in fact allowed in some situations (in opposite to what the previous fix assumed) 2005/11/23 15:43:31 fs 1.9.36.1: #121589# some more safety against an m_pKeySet which is NULL File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MResultSet.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MResultSet.hxx?r1=1.9&r2=1.10 Delta lines: +19 -0 -------------------- --- MResultSet.hxx 8 Sep 2005 06:19:52 -0000 1.9 +++ MResultSet.hxx 21 Dec 2005 13:17:27 -0000 1.10 @@ -369,6 +369,16 @@ sal_Bool _bSetColumnMapping, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, ::std::vector<sal_Int32>& _rColMapping); + + ::osl::Mutex& getMutex() { return m_aMutex; } + void methodEntry(); + + private: + inline void impl_ensureKeySet() + { + if ( !m_pKeySet.isValid() ) + m_pKeySet = new OKeySet(); + } }; inline sal_Int32 OResultSet::mapColumn(sal_Int32 column) @@ -383,6 +393,15 @@ return map; } + + class ResultSetEntryGuard : public ::osl::MutexGuard + { + public: + ResultSetEntryGuard( OResultSet& _rRS ) : ::osl::MutexGuard( _rRS.getMutex() ) + { + _rRS.methodEntry(); + } + }; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
