Browse Source

Clean up iterator

Mario Danic 8 years ago
parent
commit
7daf7a1106

+ 5 - 3
src/com/owncloud/android/services/observer/FileAlterationMagicObserver.java

@@ -54,6 +54,7 @@ import java.io.FileFilter;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -173,12 +174,13 @@ public class FileAlterationMagicObserver extends FileAlterationObserver implemen
      * @throws Exception if an error occurs
      */
     public void destroy() throws Exception {
-        while (getListeners().iterator().hasNext()) {
-            FileAlterationMagicListener fileAlterationListener = (FileAlterationMagicListener)
-                    getListeners().iterator().next();
+        Iterator iterator = getListeners().iterator();
+        while (iterator.hasNext()) {
+            FileAlterationMagicListener fileAlterationListener = (FileAlterationMagicListener) iterator.next();
             while (fileAlterationListener.getActiveTasksCount() > 0) {
                 SystemClock.sleep(250);
             }
+
         }
     }
 

+ 1 - 1
src/com/owncloud/android/services/observer/SyncedFolderObserverService.java

@@ -69,7 +69,7 @@ public class SyncedFolderObserverService extends Service {
                     observer.addListener(new FileAlterationMagicListener(syncedFolder));
                     monitor.addObserver(observer);
                 } catch (Exception e) {
-                    Log_OC.d(TAG, "Failed getting an observer to intialize");
+                    Log_OC.d(TAG, "Failed getting an observer to intialize " + e);
                 }
 
             }