[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/core/api/RowSet.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit aac6ed7a67e70c2548d81484b2930f2a0ce1e4aa
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Aug 6 15:33:46 2014 +0200

    Don't leak the previous cache
    
    Conflicts:
    	dbaccess/source/core/api/RowSet.cxx
    
    Change-Id: I61cb1c608a7de8efc63533085e86c6c17c05f545
    Reviewed-on: https://gerrit.libreoffice.org/10795
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index ca83936..d4795ee 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1701,6 +1701,10 @@ Reference< XResultSet > ORowSet::impl_prepareAndExecute_throw()
         aComposedUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), m_aUpdateCatalogName, m_aUpdateSchemaName, m_aUpdateTableName, false, ::dbtools::eInDataManipulation );
 
     SAL_INFO("dbaccess", "ORowSet::execute_NoApprove_NoNewConn: creating cache" );
+    if(m_pCache)
+    {
+        DELETEZ(m_pCache);
+    }
     m_pCache = new ORowSetCache( xResultSet, m_xComposer.get(), m_aContext, aComposedUpdateTableName, m_bModified, m_bNew,m_aParameterValueForCache,m_aFilter,m_nMaxRows );
     if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY )
     {