--- a/alwayson_net_plugin/pdpcontextmanager2/src/caoserver.cpp	Thu Aug 19 10:18:49 2010 +0300
+++ b/alwayson_net_plugin/pdpcontextmanager2/src/caoserver.cpp	Tue Aug 31 15:35:44 2010 +0300
@@ -197,7 +197,20 @@
 // CAOServer::CAOServer
 // ---------------------------------------------------------------------------
 //
-CAOServer::CAOServer()
+CAOServer::CAOServer():
+    iConnectionManager( NULL ),
+    iTimer( NULL ),
+    iRAUManager( NULL ),
+    iSettings( NULL ),
+    iGpds( NULL ),
+    iPointerStatePool( NULL ),
+    iAsyncReactivation( NULL ),
+    iFailure( MAOConnectionManager::EDisconnected ),
+    iActivationFailure( ETrue),
+    iCurrentState( NULL ),
+    iPDPPropertySubscriber( NULL ), 
+    iAsyncSetup( NULL ),
+    iCenRepObserver( NULL )
     {
     LOG_1( _L("CAOServer::CAOServer") );
     }
@@ -432,9 +445,9 @@
     // Create property subscriber
     iPDPPropertySubscriber = CAOAsyncWrapper<CAOServer>::NewL(
         this,
-        &PDPPropertySubscriptionIssueRequest,
-        &PDPPropertySubscriptionRunL,
-        &PDPPropertySubscriptionDoCancel,
+        &CAOServer::PDPPropertySubscriptionIssueRequest,
+        &CAOServer::PDPPropertySubscriptionRunL,
+        &CAOServer::PDPPropertySubscriptionDoCancel,
         NULL );
         
     // Subscribe
@@ -950,15 +963,16 @@
         &StateToDesC( CurrentState()->StateName() ) );
     
     if ( aValue != ECmCellularDataUsageDisabled )
-        {
-        TAOState* newState = NULL;
+       {
         	
         if ( CurrentState()->StateName() == TAOState::EStateDisabled )
             {
-            newState = iCurrentState->HandleEnableAlwaysOnL();
+              iCurrentState->HandleEnableAlwaysOnL();
             }
         else
             {
+            TAOState* newState = NULL;
+            
             // Behaviour is the same as if unconnect timer had expired
             iTimer->StopUnconnectTimer();
             newState = iCurrentState->HandleUnconnectTimerExpiredL();