--- a/metadataengine/server/src/mdssqliteconnection.cpp	Wed Sep 15 12:40:59 2010 +0300
+++ b/metadataengine/server/src/mdssqliteconnection.cpp	Wed Oct 13 15:02:02 2010 +0300
@@ -48,7 +48,6 @@
     CloseDb();
 
     delete iDbFileName;
-    iDbFileName = NULL;    
 
     iNotFinishFindQuery = NULL;
     }
@@ -544,11 +543,6 @@
     if (err != KErrNone)
     	{
     	_LIT( KMdsTransactionBegin, "Transaction begin error" );
-        if( !iNotFinishFindQuery )
-            {
-            iEnableTransaction = ETrue;
-            }
-        iTransactionOngoing = EFalse;
     	TraceAndLeaveL( KMdsTransactionBegin, err );
     	}
 	CleanupStack::PopAndDestroy( &emptyRow );
@@ -587,16 +581,16 @@
     RRowData emptyRow;
     CleanupClosePushL( emptyRow );
     TRAPD( err, ExecuteL(KRollback, emptyRow) );
-    if (err != KErrNone)
-        {
-        _LIT( KMdsTransactionRollback, "Transaction rollback error" );
-        TraceAndLeaveL( KMdsTransactionRollback, err );
-        }    
     if( !iNotFinishFindQuery )
         {
         iEnableTransaction = ETrue;
         }
     iTransactionOngoing = EFalse;
+    if (err != KErrNone)
+    	{
+    	_LIT( KMdsTransactionRollback, "Transaction rollback error" );
+    	TraceAndLeaveL( KMdsTransactionRollback, err );
+    	}
 	CleanupStack::PopAndDestroy( &emptyRow );
     }