-Upload manager ghost upload fix
This commit is contained in:
tonikelope 2020-12-31 18:24:10 +01:00
parent 973734881e
commit 73bbc710d7
4 changed files with 43 additions and 42 deletions

View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.tonikelope</groupId> <groupId>com.tonikelope</groupId>
<artifactId>MegaBasterd</artifactId> <artifactId>MegaBasterd</artifactId>
<version>7.33</version> <version>7.34</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@ -60,7 +60,7 @@ import javax.swing.UIManager;
*/ */
public final class MainPanel { public final class MainPanel {
public static final String VERSION = "7.33"; public static final String VERSION = "7.34";
public static final boolean FORCE_SMART_PROXY = false; //TRUE FOR DEBUGING SMART PROXY public static final boolean FORCE_SMART_PROXY = false; //TRUE FOR DEBUGING SMART PROXY
public static final int THROTTLE_SLICE_SIZE = 16 * 1024; public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024; public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;

View File

@ -754,32 +754,6 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
try { try {
bounded_executor.submitTask(() -> { bounded_executor.submitTask(() -> {
provision(transference); provision(transference);
});
} catch (InterruptedException ex) {
Logger.getLogger(TransferenceManager.class.getName()).log(Level.SEVERE, null, ex);
error = true;
MiscTools.pausar(1000);
}
} while (error);
}
if (isPreprocessing_transferences()) {
synchronized (getTransference_preprocess_queue()) {
try {
getTransference_preprocess_queue().wait(1000);
} catch (InterruptedException ex) {
Logger.getLogger(TransferenceManager.class.getName()).log(Level.SEVERE, null, ex);
}
}
}
}
executor.shutdown();
while (!executor.isTerminated()) {
MiscTools.pausar(1000);
}
synchronized (_transference_queue_sort_lock) { synchronized (_transference_queue_sort_lock) {
@ -821,6 +795,33 @@ abstract public class TransferenceManager implements Runnable, SecureSingleThrea
} }
});
} catch (InterruptedException ex) {
Logger.getLogger(TransferenceManager.class.getName()).log(Level.SEVERE, null, ex);
error = true;
MiscTools.pausar(1000);
}
} while (error);
}
if (isPreprocessing_transferences()) {
synchronized (getTransference_preprocess_queue()) {
try {
getTransference_preprocess_queue().wait(1000);
} catch (InterruptedException ex) {
Logger.getLogger(TransferenceManager.class.getName()).log(Level.SEVERE, null, ex);
}
}
}
}
executor.shutdown();
while (!executor.isTerminated()) {
MiscTools.pausar(1000);
}
_frozen = false; _frozen = false;
setSort_wait_start_queue(true); setSort_wait_start_queue(true);
setProvisioning_transferences(false); setProvisioning_transferences(false);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 KiB

After

Width:  |  Height:  |  Size: 180 KiB