phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp
branchRCL_3
changeset 6 1b9ee3c7442d
parent 3 a4a774cb6ea7
child 19 7d48bed6ce0c
--- a/phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp	Fri Mar 12 15:45:50 2010 +0200
+++ b/phoneclientserver/phoneserver/Src/Standard/CPhSrvSession.cpp	Mon Mar 15 12:42:43 2010 +0200
@@ -60,19 +60,22 @@
 // Destructor.
 // -----------------------------------------------------------------------------
 //
+
 CPhSrvSession::~CPhSrvSession()
     {
     if ( iServer )
         {
         iServer->CancelCreateAll( *this );
-        
-        if ( iContainer )
-             {
-             iServer->RemoveContainer( iContainer );
-             iContainer = NULL;
-             }
         }
+
     delete iObjectIx;
+
+    if ( iContainer )
+        {
+        //coverity[var_deref_model]
+        iServer->RemoveContainer( iContainer );
+        iContainer = NULL;
+        }
     }