From d5240e3e4235eb42a99c021f61772204f6a4cc5b Mon Sep 17 00:00:00 2001 From: Graham Date: Wed, 2 Sep 2020 17:03:07 +0100 Subject: [PATCH] Use assertions for conditions we never expect to hit Signed-off-by: Graham --- .../java/dev/openrs2/cache/NamedEntryCollection.kt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/cache/src/main/java/dev/openrs2/cache/NamedEntryCollection.kt b/cache/src/main/java/dev/openrs2/cache/NamedEntryCollection.kt index d1cbcde5ed..9e835f0e75 100644 --- a/cache/src/main/java/dev/openrs2/cache/NamedEntryCollection.kt +++ b/cache/src/main/java/dev/openrs2/cache/NamedEntryCollection.kt @@ -74,7 +74,7 @@ public abstract class NamedEntryCollection( } val entries = entries ?: return 0 - check(entries.isNotEmpty()) + assert(entries.isNotEmpty()) return entries.lastIntKey() + 1 } @@ -128,7 +128,7 @@ public abstract class NamedEntryCollection( val nameHashTable = nameHashTable ?: return null val ids = nameHashTable.getOrDefault(nameHash, IntSortedSets.EMPTY_SET) return if (ids.isNotEmpty()) { - get(ids.firstInt()) ?: throw IllegalStateException() + get(ids.firstInt()) ?: throw AssertionError() } else { null } @@ -210,20 +210,18 @@ public abstract class NamedEntryCollection( val singleEntry = singleEntry if (singleEntry != null) { - check(singleEntry.id != 0) + assert(singleEntry.id != 0) return 0 } - val entries = entries - check(entries != null) - + val entries = entries!! for (id in 0 until capacity) { if (!entries.containsKey(id)) { return id } } - throw IllegalStateException() + throw AssertionError() } internal fun rename(id: Int, prevNameHash: Int, newNameHash: Int) { @@ -234,7 +232,7 @@ public abstract class NamedEntryCollection( var nameHashTable = nameHashTable if (nameHashTable != null && prevNameHash != -1) { val set = nameHashTable.get(prevNameHash) - check(set != null && set.contains(id)) + assert(set != null && set.contains(id)) if (set.size > 1) { set.remove(id)