From 9c41de54bb7c80349c45d34bd53e734ee3e88b5b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 28 Jan 2016 17:02:31 +0100
Subject: Make hashing classes more robust, report complete blocks without hash
 info as hashing

---
 .../org/openslx/filetransfer/util/ChunkList.java   | 26 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'src/main/java/org/openslx/filetransfer/util/ChunkList.java')

diff --git a/src/main/java/org/openslx/filetransfer/util/ChunkList.java b/src/main/java/org/openslx/filetransfer/util/ChunkList.java
index c71777b..d0233ac 100644
--- a/src/main/java/org/openslx/filetransfer/util/ChunkList.java
+++ b/src/main/java/org/openslx/filetransfer/util/ChunkList.java
@@ -33,6 +33,11 @@ public class ChunkList
 
 	// 0 = complete, 1 = missing, 2 = uploading, 3 = queued for copying, 4 = copying
 	private final ByteBuffer statusArray;
+	
+	/**
+	 * True if at least one block has a checksum set
+	 */
+	private boolean hasChecksum = false;
 
 	// Do we need to keep valid chunks, or chunks that failed too many times?
 
@@ -56,9 +61,12 @@ public class ChunkList
 		for ( byte[] sum : sha1Sums ) {
 			if ( index >= allChunks.size() )
 				break;
-			if ( sum == null )
-				continue;
-			allChunks.get( index ).setSha1Sum( sum );
+			if ( sum != null ) {
+				allChunks.get( index ).setSha1Sum( sum );
+				if ( !hasChecksum ) {
+					hasChecksum = true;
+				}
+			}
 			index++;
 		}
 	}
@@ -91,7 +99,13 @@ public class ChunkList
 	{
 		byte[] array = statusArray.array();
 		for ( int i = 0; i < array.length; ++i ) {
-			array[i] = allChunks.get( i ).getStatus().val;
+			FileChunk chunk = allChunks.get( i );
+			ChunkStatus status = chunk.getStatus();
+			if ( hasChecksum && status == ChunkStatus.COMPLETE && chunk.getSha1Sum() == null ) {
+				array[i] = ChunkStatus.HASHING.val;
+			} else {
+				array[i] = chunk.getStatus().val;
+			}
 		}
 		return statusArray;
 	}
@@ -136,7 +150,7 @@ public class ChunkList
 					+ ", but chunk is not marked as currently transferring!" );
 			return;
 		}
-		c.setStatus( ChunkStatus.COMPETE );
+		c.setStatus( ChunkStatus.COMPLETE );
 		completeChunks.add( c );
 		this.notifyAll();
 	}
@@ -199,7 +213,7 @@ public class ChunkList
 				sb.append( '+' );
 			////
 			switch ( chunk.status ) {
-			case COMPETE:
+			case COMPLETE:
 				sb.append( 'C' );
 				break;
 			case COPYING:
-- 
cgit v1.2.3-55-g7522