From 4ca9cb376a331d247bb5c98e81d79e5a42921132 Mon Sep 17 00:00:00 2001
From: Christos Stathis <chstath@ebs.gr>
Date: Tue, 31 Jan 2012 13:30:14 +0200
Subject: [PATCH] Fixed ConcurrentModificationException during tree loading

---
 .../grnet/pithos/web/client/foldertree/FolderTreeViewModel.java   |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
index 8c39478..8a228c8 100644
--- a/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
+++ b/src/gr/grnet/pithos/web/client/foldertree/FolderTreeViewModel.java
@@ -41,6 +41,7 @@ import gr.grnet.pithos.web.client.foldertree.FolderTreeView.Templates;
 import gr.grnet.pithos.web.client.rest.GetRequest;
 import gr.grnet.pithos.web.client.rest.RestException;
 
+import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -175,7 +176,7 @@ public class FolderTreeViewModel implements TreeViewModel {
     }
 
     public void initialize(final AccountResource account, final Command callback) {
-        Iterator<Folder> iter = account.getContainers().iterator();
+        Iterator<Folder> iter = account.getContainers().listIterator();
         fetchFolder(iter, new Command() {
             @Override
             public void execute() {
@@ -225,7 +226,7 @@ public class FolderTreeViewModel implements TreeViewModel {
             public void onSuccess(final Folder _result) {
                 if (showfiles)
                     app.showFiles(_result);
-                Iterator<Folder> iter = _result.getSubfolders().iterator();
+                Iterator<Folder> iter = new ArrayList<Folder>(_result.getSubfolders()).listIterator();
                 fetchFolder(iter, new Command() {
                     @Override
                     public void execute() {
-- 
1.7.10.4