--- a/browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp	Tue Feb 02 00:56:45 2010 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp	Fri Mar 19 09:52:28 2010 +0200
@@ -15,16 +15,18 @@
 *
 */
 
-#include <folderattributes.h>
+
+#include "FolderAttributes.h"
 #include "FeedsDatabase.h"
 #include "FeedsServer.h"
-#include <leaktracker.h>
+#include "LeakTracker.h"
 #include "Logger.h"
 #include "PackedFeed.h"
 #include "PackedFolder.h"
 #include "UpdateAllFeedsTask.h"
 #include <SysUtil.h>
 
+
 // -----------------------------------------------------------------------------
 // CUpdateAllFeedsTask::NewL
 //
@@ -252,9 +254,6 @@
                 // Get feed's url from the datbase.
                 (void) iFeedsServer.Database().UrlFromFeedIdL(
                         iFeedIds[iNextFeedIndex], feedUrl);
-                
-                User::LeaveIfNull(feedUrl);
-                
                 CleanupStack::PushL(feedUrl);
                 
                 // Create a new task to update the feed.