--- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp	Thu Aug 19 10:28:14 2010 +0300
+++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp	Tue Aug 31 15:45:17 2010 +0300
@@ -18,11 +18,11 @@
 
 
 // INCLUDE FILES
-#include "CPhSrvServer.h"
-#include "CPhSrvSession.h"
-#include "CPhSrvSubSessionBase.h"
-#include "PhSrvSubSessionFactory.h"
-#include "PhCltClientServer.h"
+#include "cphsrvserver.h" 
+#include "cphsrvsession.h" 
+#include "cphsrvsubsessionbase.h" 
+#include "phsrvsubsessionfactory.h" 
+#include "phcltclientserver.h" 
 
 // CONSTANTS
 
@@ -60,7 +60,6 @@
 // Destructor.
 // -----------------------------------------------------------------------------
 //
-
 CPhSrvSession::~CPhSrvSession()
     {
     if ( iServer )
@@ -69,10 +68,9 @@
         }
 
     delete iObjectIx;
-
-    if ( iContainer )
+   
+   if ( iContainer )
         {
-        //coverity[var_deref_model]
         iServer->RemoveContainer( iContainer );
         iContainer = NULL;
         }
@@ -183,18 +181,18 @@
         
         if ( subSession )
             {
-	        // Check that the subsession can handle this request
-	        if ( !subSession->PhSrvMessageDecoderCanProcessMessage( function ) )
-	            {
-	            PanicClient(
-	                aMessage,
-	                EPhCltServerInitiatedPanicInvalidHandle );
-	            }
-	        else
-	            {
-	            // Get it to process this request
-	            subSession->PhSrvMessageProcessorHandleMessageL( aMessage );
-	            }
+            // Check that the subsession can handle this request
+            if ( !subSession->PhSrvMessageDecoderCanProcessMessage( function ) )
+                {
+                PanicClient(
+                    aMessage,
+                    EPhCltServerInitiatedPanicInvalidHandle );
+                }
+            else
+                {
+                // Get it to process this request
+                subSession->PhSrvMessageProcessorHandleMessageL( aMessage );
+                }
             }            
         }
     }