1 files changed, 8 insertions, 7 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java b/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java
index 1f41be8..15de77b 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java
@@ -3,7 +3,6 @@ package org.openslx.imagemaster.serverconnection;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -137,13 +136,15 @@ public class ImageProcessor
 
 	public static List<UploadingImage> getImagesToCheck()
 	{
-		List<UploadingImage> result = new LinkedList<>();
-		Iterator<String> iter = imagesToCheck.iterator();
-		log.debug( imagesToCheck );
-		while ( iter.hasNext() ) {
-			result.add( uploadingImages.get( iter.next() ) );
+		synchronized ( imagesToCheck ) {
+			if ( imagesToCheck.isEmpty() )
+				return null;
+			List<UploadingImage> result = new ArrayList<>( imagesToCheck.size() );
+			for ( String uuid : imagesToCheck ) {
+				result.add( uploadingImages.get( uuid ) );
+			}
+			return result;
 		}
-		return result;
 	}
 
 	public static List<Integer> getRequestedBlocks( String token )