From ae4bf9b5be71b4ded3e9d1f208b46046687ec26d Mon Sep 17 00:00:00 2001
From: Nikolai Sviridov <nikolaisvg@gmail.com>
Date: Mon, 12 Jun 2023 15:11:33 +0200
Subject: [PATCH] feat: add fixes from main

---
 core/src/main/kotlin/loader/gerrit/CommentsLoader.kt        | 4 ++--
 core/src/main/kotlin/loader/gerrit/LoaderChanges.kt         | 2 +-
 .../kotlin/loader/gerrit/iterators/FilesListIterator.kt     | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/src/main/kotlin/loader/gerrit/CommentsLoader.kt b/core/src/main/kotlin/loader/gerrit/CommentsLoader.kt
index 62940cb..d94eb59 100644
--- a/core/src/main/kotlin/loader/gerrit/CommentsLoader.kt
+++ b/core/src/main/kotlin/loader/gerrit/CommentsLoader.kt
@@ -8,7 +8,7 @@ class CommentsLoader(files: Sequence<File>) {
   private val loadedComments = mutableListOf<MutableMap<Int, CommentsREST>>()
   private val commentsFilesIterator = CommentsFilesIterator(files)
 
-  fun get(id: Int): CommentsREST {
+  fun get(id: Int): CommentsREST? {
     val iteratorLoadedComments = loadedComments.iterator()
     while (iteratorLoadedComments.hasNext()) {
       val loaded = iteratorLoadedComments.next()
@@ -25,7 +25,7 @@ class CommentsLoader(files: Sequence<File>) {
       value?.let { return it }
     }
 
-    throw Exception("There is no comments for id:${id}")
+    return null
   }
 
 }
diff --git a/core/src/main/kotlin/loader/gerrit/LoaderChanges.kt b/core/src/main/kotlin/loader/gerrit/LoaderChanges.kt
index afc5f30..5b628c8 100644
--- a/core/src/main/kotlin/loader/gerrit/LoaderChanges.kt
+++ b/core/src/main/kotlin/loader/gerrit/LoaderChanges.kt
@@ -209,7 +209,7 @@ class LoaderChanges(
         changeIds.add(changeId)
 
         val comments = commentsLoader.get(changeId)
-        if (change.totalCommentCount > 0) throw Exception("Can't find comments for ${change.number}")
+        if (change.totalCommentCount > 0 && comments == null) logger.severe("Can't find comments for ${change.number}")
         processChanges(change, comments)
       }
       logger.info("Finished changes from ${file.name} file")
diff --git a/core/src/main/kotlin/loader/gerrit/iterators/FilesListIterator.kt b/core/src/main/kotlin/loader/gerrit/iterators/FilesListIterator.kt
index eef7ba0..2ff2702 100644
--- a/core/src/main/kotlin/loader/gerrit/iterators/FilesListIterator.kt
+++ b/core/src/main/kotlin/loader/gerrit/iterators/FilesListIterator.kt
@@ -36,11 +36,13 @@ open class FilesListIterator<T>(
   }
 
   private fun resetIterators() {
-    if (filesIter.hasNext()) {
+    while (filesIter.hasNext()) {
       val listOfList = filesIter.next()
-      // assume files not empty
+      if (listOfList.isEmpty()) continue
+
       listIter = listOfList.iterator()
       resetValueIterator()
+      return
     }
   }