diff -r 2872ae438bf7 -r e538444823de contextengine/plugins/locationplugin/src/locationcontextplugin.cpp --- a/contextengine/plugins/locationplugin/src/locationcontextplugin.cpp Wed Sep 15 12:40:59 2010 +0300 +++ b/contextengine/plugins/locationplugin/src/locationcontextplugin.cpp Wed Oct 13 15:02:02 2010 +0300 @@ -138,39 +138,17 @@ return; } - if ( !iLocationTrailConnected ) - { - WRITELOG( "CLocationContextPlugin::ContextSnapshot() - try to reconnect" ); - iManipulator.Close(); - iLocationTrail.Close(); - TInt err = iLocationTrail.Connect(); - if ( err == KErrNone ) - { - err = iManipulator.Connect(); - if( err == KErrNone ) - { - iLocationTrailConnected = ETrue; - } - } - - if (err != KErrNone ) - { - // no trail, no snapshot - aHD.SetErrorCode( KErrDisconnected ); - aObserver.PluginSnapshotStatus( &aHD ); - return; - } + if ( !iLocationTrailConnected ) // no trail, no snapshot + { + aHD.SetErrorCode( KErrDisconnected ); + aObserver.PluginSnapshotStatus( &aHD ); + return; } TInt ret = KErrNone; ret = iManipulator.LocationSnapshot( aHD.MdeObject().Id() ); - if( ret == KErrServerTerminated ) - { - iLocationTrailConnected = EFalse; - } - if( ret != KErrNone ) { ret = KErrCompletion;