From e4ea25e63de98bc6f18801d910c746b7ca68818b Mon Sep 17 00:00:00 2001
From: "Vassiliy.Kudryashov" <Vassiliy.Kudryashov@jetbrains.com>
Date: Tue, 20 Mar 2018 15:51:50 +0300
Subject: [PATCH] IDEA-160977 Merge all similar threads

User's patch applied
---
 .../src/com/intellij/unscramble/ThreadDumpPanel.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java b/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java
index dfc315d97499..3b572db94a14 100644
--- a/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java
+++ b/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java
@@ -76,11 +76,14 @@ public class ThreadDumpPanel extends JPanel implements DataProvider {
       ThreadState state = copy.get(i);
       ThreadState.CompoundThreadState compound = new ThreadState.CompoundThreadState(state);
       myMergedThreadDump.add(compound);
-      for (int j = i+1; j < copy.size(); j++) {
+      for (int j = i + 1; j < copy.size(); ) {
         ThreadState toAdd = copy.get(j);
         if (compound.add(toAdd)) {
           copy.remove(j);
         }
+        else {
+          j++;
+        }
       }
     }