From 6ecdc72c99dd1dd91f2a16e71129da451319bf2c Mon Sep 17 00:00:00 2001 From: sokomishalov Date: Fri, 20 Sep 2019 12:36:31 +0300 Subject: [PATCH] zip input stream hot fix --- .../ru/sokomishalov/commons/core/io/IOUtils.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/io/IOUtils.kt b/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/io/IOUtils.kt index 53b0d7f..7dba93f 100644 --- a/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/io/IOUtils.kt +++ b/commons-core/src/main/kotlin/ru/sokomishalov/commons/core/io/IOUtils.kt @@ -14,16 +14,16 @@ import org.apache.commons.io.IOUtils.toByteArray as iOUtilsToByteArray fun InputStream.toByteArray(): ByteArray = iOUtilsToByteArray(this) fun ZipInputStream.toIterableEntries(): Iterable = object : Iterable { - override fun iterator(): Iterator { - return object : Iterator { - var next: ZipEntry? = nextEntry + override fun iterator(): Iterator = object : Iterator { + var next: ZipEntry? = null - override operator fun hasNext() = next != null - override operator fun next(): ZipEntry { - val tmp = next ?: throw NoSuchElementException() - next = nextEntry - return tmp - } + override operator fun hasNext(): Boolean { + next = nextEntry + return next != null + } + + override operator fun next(): ZipEntry { + return next ?: throw NoSuchElementException() } } } \ No newline at end of file