diff -r 57a65a3a658c -r 06f47423ecee devicediagnosticsfw/diagresultsdb/client/src/diagresultsdatabase.cpp
--- a/devicediagnosticsfw/diagresultsdb/client/src/diagresultsdatabase.cpp	Fri Feb 19 23:41:35 2010 +0200
+++ b/devicediagnosticsfw/diagresultsdb/client/src/diagresultsdatabase.cpp	Fri Mar 12 15:46:48 2010 +0200
@@ -81,13 +81,15 @@
 void RDiagResultsDatabase::DoConnectL (TUid aAppUid)
     {
     LOGME("RDiagResultsDatabase::DoConnectL");
-    if (iBuffer==NULL)
-		{
+    if (iBuffer==NULL) {
 		iBuffer = CBufFlat::NewL(KResultsDatabaseGranuality);
-		iBuffer->ResizeL(KResultsDatabaseBufferLength);
-		if (iBuffer==NULL)
+		
+		if (iBuffer==NULL) {
 			User::Leave( KErrNoMemory );
 		}
+		
+		iBuffer->ResizeL(KResultsDatabaseBufferLength);
+	}
     
     TInt r = DiagResultsDbCommon::StartServer();
     LOGME1("RDiagResultsDatabase::StartServer %d",r);
@@ -555,9 +557,12 @@
     if (iBuffer==NULL)
 		{
 		iBuffer = CBufFlat::NewL(KResultsDatabaseGranuality);
+		
+		if (iBuffer==NULL) {
+			User::Leave( KErrNoMemory );
+		}
+		
 		iBuffer->ResizeL(KResultsDatabaseSubsessionBufferLength);
-		if (iBuffer==NULL)
-			User::Leave( KErrNoMemory );
 		}
     
     iOpen = ETrue;
@@ -651,13 +656,15 @@
             TUid& aRecordId,
             CDiagResultsDbRecordEngineParam& aEngineParam )
     {
-     if (iBuffer==NULL)
-		{
+     if (iBuffer==NULL) {
 		iBuffer = CBufFlat::NewL(KResultsDatabaseGranuality);
-		iBuffer->ResizeL(KResultsDatabaseSubsessionBufferLength);
-		if (iBuffer==NULL)
+		
+		if (iBuffer==NULL) {
 			User::Leave( KErrNoMemory );
 		}
+		
+		iBuffer->ResizeL(KResultsDatabaseSubsessionBufferLength);
+    }
         
     iBuffer->Delete( 0, iBuffer->Size() );
     iBuffer->ResizeL( KResultsDatabaseSubsessionBufferLength );