Fix some small things

1 files changed, 10 insertions, 10 deletions

diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java b/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java
index bf21c71..272b924 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java
@@ -79,7 +79,7 @@ public class ImageProcessor
 			// TODO: proper synchronization, interface is multi threaded.
 			// should synchronize operations on the map (use concurrent map) and then synchronize on the uploading image
 			// when handing the missing blocks etc...
-			uploadingImages.put( uuid, new UploadingImageInfos( token, allBlocks, serverSessionId, new Timestamp( System.currentTimeMillis() ) ) );
+			uploadingImages.put( uuid, new UploadingImageInfos( token, allBlocks, serverSessionId, new Timestamp( System.currentTimeMillis() ), uuid ) );
 			DbImage.insert( imageData, System.currentTimeMillis(), token, allBlocks, serverSessionId, filepath );
 
 			List<Integer> missing = getMissingBlocks( uuid, AMOUNT );
@@ -167,11 +167,11 @@ public class ImageProcessor
 		for ( int i = 0; i < amount; i++ ) {
 			result.add( list.get( i ) );
 		}
-		
-		synchronized( image ) {
+
+		synchronized ( image ) {
 			image.setLastSentBlocks( result );
 		}
-		
+
 		return result;
 	}
 
@@ -183,14 +183,14 @@ public class ImageProcessor
 	 */
 	private static void uploadDone( String uuid )
 	{
-		String token;
+		UploadingImageInfos image;
 		synchronized ( uploadingImages ) {
-			token = uploadingImages.remove( uuid ).getToken();
+			image = uploadingImages.remove( uuid );
 		}
-		DbImage.updateMissingBlocks( uuid, null );
+		image.getDbImage().updateMissingBlocks( null );
 		// file was already downloaded in the right location by the updownloader class.
 		// remove the connection so that it can be used by a new client
-		ConnectionHandler.removeConnection( token );
+		ConnectionHandler.removeConnection( image.getToken() );
 	}
 
 	/**
@@ -202,8 +202,8 @@ public class ImageProcessor
 		for ( DbImage image : list ) {
 			String token = image.token;
 			ConnectionHandler.addConnection( token, image.imagePath, ConnectionData.UPLOADING );
-			UploadingImageInfos infos = new UploadingImageInfos( token, image.missingBlocks, image.serverSessionId, image.timestamp );
-			uploadingImages.put( image.UUID, infos );
+			UploadingImageInfos infos = new UploadingImageInfos( token, image.missingBlocks, image.serverSessionId, image.timestamp, image.uuid );
+			uploadingImages.put( image.uuid, infos );
 		}
 		log.info( "Added " + list.size() + " pending upload(s) to process list again." );
 	}