diff -r dd21522fd290 -r 7c90e6132015 webengine/osswebengine/cache/src/HttpCacheManager.cpp --- a/webengine/osswebengine/cache/src/HttpCacheManager.cpp Mon Mar 30 12:54:55 2009 +0300 +++ b/webengine/osswebengine/cache/src/HttpCacheManager.cpp Fri May 08 08:25:06 2009 +0300 @@ -137,7 +137,7 @@ const TDesC8& aUrl ) { TBool VSSTransaction ( EFalse ); - if( iVSSCacheEnabled && HttpCacheUtil::VSSCacheContent( aUrl, iVSSWhiteList ) ) + if ( iVSSCacheEnabled && HttpCacheUtil::VSSCacheContent( aUrl, iVSSWhiteList ) ) { RStringPool strP = aTrans.Session().StringPool(); @@ -164,13 +164,13 @@ CleanupClosePushL( VSSnameStr); THTTPHdrVal tempVal; - if( aHttpHeader.GetField( VSSnameStr, 0, tempVal ) == KErrNone ) + if ( aHttpHeader.GetField( VSSnameStr, 0, tempVal ) == KErrNone ) { TPtrC8 valueStr ( KVSSHeaderFileldValue() ); RStringF VSSValueStr = strP.OpenFStringL( valueStr ); CleanupClosePushL( VSSValueStr ); - if( tempVal == VSSValueStr ) + if ( tempVal == VSSValueStr ) { VSSTransaction = ETrue; } @@ -178,6 +178,7 @@ } CleanupStack::PopAndDestroy(); // VSSnameStr } //end if( iVSSCacheEnabled && HttpCacheUtil::VSSCacheContent( aUrl, iVSSWhiteList ) ) + return VSSTransaction; } // ----------------------------------------------------------------------------- @@ -353,7 +354,7 @@ } //failure here is not mission critical - TRAPD( error, RemoveOrphanedFilesL() ); + TRAP_IGNORE( RemoveOrphanedFilesL() ); return numOfBytes; }