yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

GP-0: Fixing yield keyword conflict when compiling with JDK 17

Browse source 
compliance.
This commit is contained in:
Ryan Kurtz 2022-03-03 07:54:56 -05:00
parent 046623b1f7
commit 1996cdacd1
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/AutoAnalysisManager.java
View file

@ -577,7 +577,7 @@ public class AutoAnalysisManager implements DomainObjectListener, DomainObjectCl
Integer originalPriority = activeTask.taskPriority; Integer originalPriority = activeTask.taskPriority;
activeTask.taskPriority = limitPriority; activeTask.taskPriority = limitPriority;
try { try {
yield(limitPriority, monitor); this.yield(limitPriority, monitor);
} }
finally { finally {
activeTask.taskPriority = originalPriority; activeTask.taskPriority = originalPriority;
@ -652,7 +652,7 @@ public class AutoAnalysisManager implements DomainObjectListener, DomainObjectCl
// Thinking was that if some analysis causes disassembly to occur, // Thinking was that if some analysis causes disassembly to occur,
// then that disassembly and it's analysis will keep other analysis out of trouble. // 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. // 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) { else if (analysisThread != null || !isEnabled) {
// this could be a sub-thread of a task, don't yield, or flush domain objects // this could be a sub-thread of a task, don't yield, or flush domain objects