oracle provider: fix closing of iterator in case of error

This commit is contained in:
Juergen E. Fischer 2014-06-29 13:10:34 +02:00
parent 6def4b60ff
commit 9f7771778e

View File

@ -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();