summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImage.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/serverconnection/UploadingImage.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/serverconnection/UploadingImage.java50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImage.java b/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImage.java
index feb2a1e..7c491f6 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImage.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/UploadingImage.java
@@ -50,24 +50,24 @@ public class UploadingImage
{
if ( blockStatus == null )
return;
- synchronized(blockStatus) {
+ synchronized ( blockStatus ) {
blockStatus[index] = valid;
}
}
-
+
protected void updateDb()
{
if ( blockStatus == null )
return;
-
- List<Integer> missingBlocks = new ArrayList<>();
-
- synchronized(blockStatus) {
- for (int block = 0; block < blockStatus.length; block++) {
- if (blockStatus[block] != valid) {
- missingBlocks.add( block );
- }
- }
+
+ List<Integer> missingBlocks = new ArrayList<>();
+
+ synchronized ( blockStatus ) {
+ for ( int block = 0; block < blockStatus.length; block++ ) {
+ if ( blockStatus[block] != valid ) {
+ missingBlocks.add( block );
+ }
+ }
}
dbImage.updateMissingBlocks( missingBlocks );
}
@@ -76,7 +76,7 @@ public class UploadingImage
{
if ( blockStatus == null )
return;
- synchronized(blockStatus) {
+ synchronized ( blockStatus ) {
blockStatus[index] = missing;
}
}
@@ -85,7 +85,7 @@ public class UploadingImage
{
if ( blockStatus == null )
return;
- synchronized(blockStatus) {
+ synchronized ( blockStatus ) {
blockStatus[index] *= ( blockStatus[index] < missing ) ? -1 : 1; // switch to positive value if needed
}
}
@@ -94,7 +94,7 @@ public class UploadingImage
{
if ( blockStatus == null )
return;
- synchronized(blockStatus) {
+ synchronized ( blockStatus ) {
blockStatus[index] *= ( blockStatus[index] > missing ) ? -1 : 1; // switch to negative value if needed
}
}
@@ -103,15 +103,15 @@ public class UploadingImage
{
if ( blockStatus == null || blockStatus[index] == 200 )
return;
- synchronized(blockStatus) {
+ synchronized ( blockStatus ) {
blockStatus[index] += ( blockStatus[index] <= missing ) ? -1 : 1; // increase in both directions
}
}
protected int getTimesTransmitted( int index )
{
- synchronized(blockStatus) {
- return Math.abs( blockStatus[index] );
+ synchronized ( blockStatus ) {
+ return ( blockStatus[index] > 0 ) ? blockStatus[index] : ( -1 ) * blockStatus[index];
}
}
@@ -124,7 +124,7 @@ public class UploadingImage
{
if ( blockStatus == null )
return false;
- synchronized(blockStatus) {
+ synchronized ( blockStatus ) {
return ( ( blockStatus[index] >= missing ) && ( blockStatus[index] != valid ) );
}
}
@@ -133,7 +133,7 @@ public class UploadingImage
{
if ( blockStatus == null )
return false;
- synchronized(blockStatus) {
+ synchronized ( blockStatus ) {
return ( blockStatus[index] < missing );
}
}
@@ -192,16 +192,16 @@ public class UploadingImage
}
return result;
}
-
+
public boolean allBlocksValid()
{
if ( blockStatus == null )
return false;
- synchronized(blockStatus) {
- for ( int i : blockStatus ) {
- if ( i != 200 )
- return false;
- }
+ synchronized ( blockStatus ) {
+ for ( int i : blockStatus ) {
+ if ( i != 200 )
+ return false;
+ }
}
return true;
}