kopia lustrzana https://github.com/JOSM/MapWithAI
Fix a probable deadlock
Signed-off-by: Taylor Smock <taylor.smock@kaart.com>pull/1/head
rodzic
0b10f3f927
commit
6efbd64625
|
@ -11,6 +11,8 @@ import java.awt.GridBagLayout;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.TimeoutException;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
import javax.swing.Icon;
|
import javax.swing.Icon;
|
||||||
|
@ -47,14 +49,16 @@ public class MapWithAIDownloadReader implements DownloadSource<MapWithAIDownload
|
||||||
task.setZoomAfterDownload(settings.zoomToData());
|
task.setZoomAfterDownload(settings.zoomToData());
|
||||||
DownloadParams params = new DownloadParams();
|
DownloadParams params = new DownloadParams();
|
||||||
params.withNewLayer(settings.asNewLayer());
|
params.withNewLayer(settings.asNewLayer());
|
||||||
try {
|
MapWithAIDataUtils.getForkJoinPool().execute(() -> {
|
||||||
task.download(params, area, null).get();
|
try {
|
||||||
} catch (InterruptedException e) {
|
task.download(params, area, null).get(300, TimeUnit.SECONDS);
|
||||||
Logging.error(e);
|
} catch (InterruptedException e) {
|
||||||
Thread.currentThread().interrupt();
|
Logging.error(e);
|
||||||
} catch (ExecutionException e) {
|
Thread.currentThread().interrupt();
|
||||||
Logging.error(e);
|
} catch (ExecutionException | TimeoutException e) {
|
||||||
}
|
Logging.error(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Ładowanie…
Reference in New Issue