From d67a5e690f2cf9fd78e81bf83e3c0be335c1db49 Mon Sep 17 00:00:00 2001 From: Graham Date: Wed, 13 Jan 2021 17:53:50 +0000 Subject: [PATCH] Add request() method Signed-off-by: Graham --- .../org/openrs2/archive/cache/Js5ChannelHandler.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt index 31c697f4..51a13058 100644 --- a/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt +++ b/archive/src/main/kotlin/org/openrs2/archive/cache/Js5ChannelHandler.kt @@ -95,8 +95,7 @@ public class Js5ChannelHandler( Js5ResponseDecoder() ) - val request = Js5Request.Group(false, Js5Archive.ARCHIVESET, Js5Archive.ARCHIVESET) - pendingRequests += request + request(Js5Archive.ARCHIVESET, Js5Archive.ARCHIVESET) } private fun handleClientOutOfDate(ctx: ChannelHandlerContext) { @@ -161,7 +160,7 @@ public class Js5ChannelHandler( if (index != null) { processIndex(archive, index) } else { - pendingRequests += Js5Request.Group(false, Js5Archive.ARCHIVESET, archive) + request(Js5Archive.ARCHIVESET, archive) } } } finally { @@ -188,10 +187,14 @@ public class Js5ChannelHandler( importer.importIndexAndGetMissingGroups(archive, index, buf) } for (group in groups) { - pendingRequests += Js5Request.Group(false, archive, group) + request(archive, group) } } + private fun request(archive: Int, group: Int) { + pendingRequests += Js5Request.Group(false, archive, group) + } + private fun releaseGroups() { groups.forEach(CacheImporter.Group::release) groups.clear()