From 8a776567b525dc38dcc3362f2fe2925c4a5d4791 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Thu, 3 Mar 2022 07:54:56 -0500 Subject: [PATCH] GP-0: Fixing yield keyword conflict when compiling with JDK 17 compliance. --- .../ghidra/app/plugin/core/analysis/AutoAnalysisManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java index 042882c9a9..13dd0c5df9 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java +++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java @@ -577,7 +577,7 @@ public class AutoAnalysisManager implements DomainObjectListener, DomainObjectCl Integer originalPriority = activeTask.taskPriority; activeTask.taskPriority = limitPriority; try { - yield(limitPriority, monitor); + this.yield(limitPriority, monitor); } finally { activeTask.taskPriority = originalPriority; @@ -652,7 +652,7 @@ public class AutoAnalysisManager implements DomainObjectListener, DomainObjectCl // Thinking was that if some analysis causes disassembly to occur, // then that disassembly and it's analysis will keep other analysis out of trouble. // However for single threaded, this might not be worthwhile in the long run. - yield(activeTask.taskPriority, monitor); + this.yield(activeTask.taskPriority, monitor); } else if (analysisThread != null || !isEnabled) { // this could be a sub-thread of a task, don't yield, or flush domain objects