--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailmdsquerytask.cpp	Wed Sep 15 12:32:44 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailmdsquerytask.cpp	Wed Oct 13 14:53:56 2010 +0300
@@ -36,7 +36,7 @@
 //
 CThumbnailMDSQueryTask::CThumbnailMDSQueryTask(
         CThumbnailTaskProcessor& aProcessor, TInt aPriority, CMdESession* aMdESession, CThumbnailServer& aServer): 
-        CThumbnailTask( aProcessor, aPriority ), iMdESession( aMdESession ), iQuery(NULL), iServer(aServer), iUpdateToDb(ETrue)
+        CThumbnailTask( aProcessor, aPriority ), iMdESession( aMdESession ), iServer(aServer), iUpdateToDb(ETrue)
     {
     TN_DEBUG2( "CThumbnailMDSQueryTask(0x%08x)::CThumbnailMDSQueryTask()", this );
     }
@@ -55,7 +55,6 @@
         {
         iQuery->Cancel();
         delete iQuery;
-        iQuery = NULL;
         }
     }
 
@@ -183,21 +182,14 @@
     CMdENamespaceDef* defNamespace = &iMdESession->GetDefaultNamespaceDefL();
     CMdEObjectDef& objDef = defNamespace->GetObjectDefL( MdeConstants::Object::KBaseObject );
     
-    delete iQuery;
-    iQuery = NULL;
+    iQuery = iMdESession->NewObjectQueryL( *defNamespace, objDef, this );
+    iQuery->SetResultMode( EQueryResultModeItem );
+
+    CMdELogicCondition& rootCondition = iQuery->Conditions();
+    rootCondition.SetOperator( ELogicConditionOperatorOr );
     
-    iQuery = iMdESession->NewObjectQueryL( *defNamespace, objDef, this );
-	
-	if(iQuery)
-		{
-	    iQuery->SetResultMode( EQueryResultModeItem );
-
-    	CMdELogicCondition& rootCondition = iQuery->Conditions();
-	    rootCondition.SetOperator( ELogicConditionOperatorOr );
-    
-	    // add ID condition
-    	rootCondition.AddObjectConditionL( aId );
-		}
+    // add ID condition
+    rootCondition.AddObjectConditionL( aId );
     }
 
 // ---------------------------------------------------------------------------