ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

cache: throw less out of download()

Browse Source
This commit is contained in:
Adam
2017-09-03 22:02:23 -04:00
parent 9e00655326
commit ce250f789e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cache/src/main/java/net/runelite/cache/client/CacheClient.java vendored
View File

@@ -37,14 +37,12 @@ import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.channel.socket.nio.NioSocketChannel;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayDeque; import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import net.runelite.cache.client.requests.ConnectionInfo; import net.runelite.cache.client.requests.ConnectionInfo;
import net.runelite.cache.client.requests.FileRequest; import net.runelite.cache.client.requests.FileRequest;
import net.runelite.cache.client.requests.HelloHandshake; import net.runelite.cache.client.requests.HelloHandshake;
@@ -194,7 +192,7 @@ public class CacheClient implements AutoCloseable
return indexInfo; return indexInfo;
} }
public void download() throws InterruptedException, ExecutionException, FileNotFoundException, IOException public void download() throws IOException
{ {
Stopwatch stopwatch = Stopwatch.createStarted(); Stopwatch stopwatch = Stopwatch.createStarted();
@@ -230,7 +228,7 @@ public class CacheClient implements AutoCloseable
logger.info("Downloading index {}", i); logger.info("Downloading index {}", i);
FileResult indexFileResult = requestFile(255, i, true).get(); FileResult indexFileResult = requestFile(255, i, true).join();
indexFileResult.decompress(null); indexFileResult.decompress(null);
logger.info("Downloaded index {}", i); logger.info("Downloaded index {}", i);
@@ -307,7 +305,14 @@ public class CacheClient implements AutoCloseable
// wait for pending requests // wait for pending requests
synchronized (this) synchronized (this)
{ {
wait(); try
{
wait();
}
catch (InterruptedException ex)
{
logger.warn(null, ex);
}
} }
} }