Merge pull request apache#4793 from mbien/cancel-noop

NBABasedBulkSearch::encode doesn't return on cancel
Chris2011 · Nov 8, 2022 · 819c07a · 819c07a
2 parents b8900c1 + bbf45b3
commit 819c07a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/NFABasedBulkSearch.java b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/NFABasedBulkSearch.java
@@ -448,7 +448,9 @@ public void encode(Tree tree, final EncodingContext ctx, AtomicBoolean cancel) {
                 throw new IllegalStateException(ex);
             }
         }
-        if (cancel.get());
+        if (cancel.get()) {
+            return;
+        }
         new CollectIdentifiers<Void, Void>(new HashSet<>(), cancel) {
             private boolean encode = true;
             @Override
@@ -511,7 +513,6 @@ public Void scan(Iterable<? extends Tree> nodes, Void p) {
 
         ctx.setIdentifiers(identifiers);
         ctx.setContent(content);
-        if (cancel.get());
     }
 
     @Override