Revision dccd340f trunk/Pithos.Core/Agents/PollAgent.cs

b/trunk/Pithos.Core/Agents/PollAgent.cs
189 189
            Contract.EndContractBlock();
190 190

  
191 191

  
192
            using (log4net.ThreadContext.Stacks["Retrieve Remote"].Push(accountInfo.UserName))
192
            using (ThreadContext.Stacks["Retrieve Remote"].Push(accountInfo.UserName))
193 193
            {
194 194

  
195 195
                await NetworkAgent.GetDeleteAwaiter();
......
228 228
                    listObjects.Add(listShared);
229 229
                    var listTasks = await Task.Factory.WhenAll(listObjects.ToArray());
230 230

  
231
                    using (log4net.ThreadContext.Stacks["SCHEDULE"].Push("Process Results"))
231
                    using (ThreadContext.Stacks["SCHEDULE"].Push("Process Results"))
232 232
                    {
233 233
                        var dict = listTasks.ToDictionary(t => t.AsyncState);
234 234

  
......
285 285

  
286 286
                        //And remove those that are already being processed by the agent
287 287
                        var distinctActions = allActions
288
                            .Except(NetworkAgent.GetEnumerable(), new PithosMonitor.LocalFileComparer())
288
                            .Except(NetworkAgent.GetEnumerable(), new LocalFileComparer())
289 289
                            .ToList();
290 290

  
291 291
                        //Queue all the actions
......
540 540
            //over the remote files
541 541
            foreach (var objectInfo in creates)
542 542
            {
543
                if (Log.IsDebugEnabled)
544
                    Log.DebugFormat("[NEW INFO] {0}",objectInfo.Uri);
545

  
543 546
                var relativePath = objectInfo.RelativeUrlToFilePath(accountInfo.UserName);
544 547
                //If the object already exists, we probably have a conflict
545 548
                if (fileAgent.Exists(relativePath))
546 549
                {
550
                    Log.DebugFormat("[SKIP EXISTING] {0}", objectInfo.Uri);
547 551
                    //If a directory object already exists, we don't need to perform any other action                    
548 552
                    var localFile = fileAgent.GetFileSystemInfo(relativePath);
549 553
                    StatusKeeper.SetFileState(localFile.FullName, FileStatus.Conflict, FileOverlayStatus.Conflict);
......
608 612
        {
609 613
            AccountInfo account;
610 614
            _accounts.TryRemove(accountInfo.UserName,out account);
615
            SnapshotDifferencer differencer;
616
            _differencer.Differencers.TryRemove(accountInfo.UserName, out differencer);
611 617
        }
612 618
    }
613 619
}

Also available in: Unified diff