mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
oracle provider: fix closing of iterator in case of error
This commit is contained in:
parent
6def4b60ff
commit
9f7771778e
@ -107,8 +107,7 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource* sour
|
||||
whereClause += "(" + mSource->mSqlWhereClause + ")";
|
||||
}
|
||||
|
||||
if ( !openQuery( whereClause ) )
|
||||
return;
|
||||
openQuery( whereClause );
|
||||
}
|
||||
|
||||
QgsOracleFeatureIterator::~QgsOracleFeatureIterator()
|
||||
@ -252,10 +251,8 @@ bool QgsOracleFeatureIterator::rewind()
|
||||
|
||||
bool QgsOracleFeatureIterator::close()
|
||||
{
|
||||
if ( !mQry.isActive() )
|
||||
return false;
|
||||
|
||||
mQry.finish();
|
||||
if ( mQry.isActive() )
|
||||
mQry.finish();
|
||||
|
||||
if ( mConnection )
|
||||
mConnection->disconnect();
|
||||
|
Loading…
x
Reference in New Issue
Block a user