diff options
author | Nils Schwabe | 2014-07-23 16:06:47 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-07-23 16:06:47 +0200 |
commit | a956b282692a5d84fd7efac1b1018cccf41653bf (patch) | |
tree | 7b595a24a0a00a28e252d7dbd9b434ad59d9d8c3 /src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java | |
parent | Fix some bugs while testing the connection (diff) | |
download | masterserver-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/serverconnection/ImageProcessor.java')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java b/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java index a27d543..b872b25 100644 --- a/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java +++ b/src/main/java/org/openslx/imagemaster/serverconnection/ImageProcessor.java @@ -22,6 +22,7 @@ import org.openslx.imagemaster.thrift.iface.UploadError; import org.openslx.imagemaster.thrift.iface.UploadException; import org.openslx.imagemaster.thrift.iface.UploadInfos; import org.openslx.imagemaster.util.RandomString; +import org.openslx.imagemaster.util.Util; /** * Processing the up- and download of images. @@ -109,8 +110,8 @@ public class ImageProcessor throw new UploadException( UploadError.INVALID_CRC, "CRC sums were invalid." ); filepath = Globals.getImageDir() + "/" + uuid + ".vmdk"; token = RandomString.generate( 100, false ); - nBlocks = crcSums.size() - 1; - allBlocks = new int[ nBlocks ]; // initalize array with all zeros which mean that this block is missing + nBlocks = Util.getNumberOfBlocks( imageData.fileSize, Globals.blockSize ); + allBlocks = new int[ nBlocks ]; // initialize array with all zeros which mean that this block is missing image = new UploadingImage( token, allBlocks, System.currentTimeMillis(), uuid, filepath ); uploadingImages.put( uuid, image ); } |