summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/db
diff options
context:
space:
mode:
authorNils Schwabe2014-07-23 16:06:47 +0200
committerNils Schwabe2014-07-23 16:06:47 +0200
commita956b282692a5d84fd7efac1b1018cccf41653bf (patch)
tree7b595a24a0a00a28e252d7dbd9b434ad59d9d8c3 /src/main/java/org/openslx/imagemaster/db
parentFix some bugs while testing the connection (diff)
downloadmasterserver-a956b282692a5d84fd7efac1b1018cccf41653bf.tar.gz
masterserver-a956b282692a5d84fd7efac1b1018cccf41653bf.tar.xz
masterserver-a956b282692a5d84fd7efac1b1018cccf41653bf.zip
Add "synchronized" to UploadingImage
Add method to calc the amount of blocks to Util
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db')
-rw-r--r--src/main/java/org/openslx/imagemaster/db/DbImage.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbImage.java b/src/main/java/org/openslx/imagemaster/db/DbImage.java
index 386c509..099738f 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbImage.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbImage.java
@@ -8,6 +8,7 @@ import java.util.List;
import org.openslx.imagemaster.Globals;
import org.openslx.imagemaster.serverconnection.UploadingImage;
import org.openslx.imagemaster.thrift.iface.ImageData;
+import org.openslx.imagemaster.util.Util;
public class DbImage
{
@@ -73,11 +74,11 @@ public class DbImage
this.token = token;
String[] parts = missingBlocksList.split( ";" );
- blockStatus = new int[ (int)Math.ceil( this.fileSize / Globals.blockSize ) ]; // initialize array to ones
+ blockStatus = new int[ Util.getNumberOfBlocks( fileSize, Globals.blockSize ) ]; // initialize array to ones
for ( int i : blockStatus ) {
blockStatus[i] = UploadingImage.valid;
}
- for ( int i = 0; i < parts.length; i++ ) { // do not copy the last empty string (1;2;3;) -> "1","2","3",""
+ for ( int i = 0; i < parts.length; i++ ) {
blockStatus[i] = UploadingImage.missing;
}