Generate IDs locally in ObjectPools

Author: fwcd

adapter/src/main/kotlin/org/javacs/ktda/util/ObjectPool.kt

@@ -12,15 +12,15 @@ private data class ObjectMapping<O, V> (
 	val value: V
 )
 
-private var currentID = 1L
-
 /**
  * Maps objects of owners to multiple owned values.
  * To store and retrieve objects, unique ids are used.
  */
 class ObjectPool<O, V> {
 	private val mappingsByID = mutableMapOf<Long, ObjectMapping<O, V>>()
 	private val mappingsByOwner = mutableMapOf<O, MutableSet<ObjectMapping<O, V>>>()
+
+	private var currentID = 1L
 
 	val empty: Boolean
 		get() = mappingsByID.isEmpty()
@@ -76,12 +76,10 @@ class ObjectPool<O, V> {
 	fun containsID(id: Long) = mappingsByID.contains(id)
 
 	private fun nextID(): Long {
-		var id = currentID
+		do {
+			currentID++
+		} while (containsID(currentID));
 
-		while (containsID(id)) {
-			id += 1
-		}
-
-		return id
+		return currentID
 	}
 }