diff -r e4d67989cc36 -r 18f64da82512 genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp --- a/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Tue Feb 02 02:01:42 2010 +0200 +++ b/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Sat Feb 20 00:31:00 2010 +0200 @@ -165,13 +165,23 @@ err |= iDefConnLock.CreateLocal(); } + if(err == KErrNone) + { + err = iTzServer.Connect(); + if(!err) + { + err = iTzServer.ShareAuto(); + } + } + + //Panic if any of the above operation returns with error if (err) { User::Panic(KEstlibInit, err); } - iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock); + iCleanup.StorePtrs(iPrivateHeap, &iFs, &iSs, &iCs, &iSSLock, &iCSLock, &iTzServer); // No connection settings by default iDefConnPref = NULL; @@ -1600,13 +1610,13 @@ { err=iFids.Attach(fd,newf); if (!err) - return fd; - delete newf; + return fd; + newf->Close(); } else if(newf != NULL) { //coverity[leave_without_push] - delete newf; + newf->Close(); } iFids.Attach(fd,0); // cancel the reservation }