From 091f2f20ae3acebd4ae4be2d7ac7202aeda3d5df Mon Sep 17 00:00:00 2001
From: Dusan Balek <dusan.balek@oracle.com>
Date: Thu, 4 Nov 2021 12:00:57 +0100
Subject: [PATCH 1/2] Invalidate existing Sources after reindexing.

---
 .../modules/parsing/impl/indexing/RepositoryUpdater.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java
index 134442d035d1..beab9cdac812 100644
--- a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java
+++ b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java
@@ -3297,9 +3297,9 @@ public Boolean call() throws Exception {
                                 final List<Indexable> resources = crawler.getResources();
                                 if (crawler.isFinished()) {
                                     logCrawlerTime(crawler, t);
-                                    invalidateSources(resources);
                                     delete(crawler.getDeletedResources(), ctxToFinish, usedIterables);
                                     indexResult = index(resources, crawler.getAllResources(), root, sourceForBinaryRoot, indexers, invalidatedMap, ctxToFinish, usedIterables);
+                                    invalidateSources(resources);
                                     if (indexResult) {
                                         crawler.storeTimestamps();
                                         return true;
@@ -5721,7 +5721,6 @@ public Boolean call() throws Exception {
                                 try {
                                     scanStarted (root, sourceForBinaryRoot, indexers, invalidatedMap, ctxToFinish);
                                     delete(deleted, ctxToFinish, usedIterables);
-                                    invalidateSources(resources);
                                     final long tm = System.currentTimeMillis();
                                     final boolean rlAdded = RepositoryUpdater.getDefault().rootsListeners.addSource(root, entry);
                                     if (recursiveListenersTime != null) {
@@ -5737,6 +5736,7 @@ public Boolean call() throws Exception {
                                                 invalidatedMap,
                                                 ctxToFinish,
                                                 usedIterables);
+                                        invalidateSources(resources);
                                         if (indexResult) {
                                             crawler.storeTimestamps();
                                             outOfDateFiles[0] = resources.size();

From 58191a26cc5486b1fb5513909ba9689f32e8bb57 Mon Sep 17 00:00:00 2001
From: Dusan Balek <dusan.balek@oracle.com>
Date: Thu, 4 Nov 2021 16:14:51 +0100
Subject: [PATCH 2/2] Removing @RandomlyFailing from SdkSuiteTest.

---
 .../src/org/netbeans/modules/java/mx/project/SdkSuiteTest.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SdkSuiteTest.java b/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SdkSuiteTest.java
index 819bd7220d48..df4bfd254afb 100644
--- a/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SdkSuiteTest.java
+++ b/java/java.mx.project/test/unit/src/org/netbeans/modules/java/mx/project/SdkSuiteTest.java
@@ -28,7 +28,6 @@
 import org.netbeans.api.java.queries.SourceForBinaryQuery;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectManager;
-import org.netbeans.junit.RandomlyFails;
 import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 
@@ -41,7 +40,6 @@ public static junit.framework.Test suite() {
         return suite(SdkSuiteTest.class);
     }
 
-    @RandomlyFails
     public void testParseSdkSourcesWithoutError() throws Exception {
         verifyNoErrorsInSuite("sdk");
     }