Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-10-23 05:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2024-09-13-1' into Ghidra_11.2

Browse Source
This commit is contained in:
Ryan Kurtz 2024-09-13 10:09:47 -04:00
commit ac7168d103
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiTarget.java
View File

@ -809,13 +809,15 @@ public class TraceRmiTarget extends AbstractTarget {
public MatchedMethod getBest(String name, ActionName action, public MatchedMethod getBest(String name, ActionName action,
Supplier<List<? extends MethodMatcher>> preferredSupplier) { Supplier<List<? extends MethodMatcher>> preferredSupplier) {
return map.computeIfAbsent(name, n -> chooseBest(action, preferredSupplier.get())); return getBest(name, action, preferredSupplier.get());
} }
public MatchedMethod getBest(String name, ActionName action, public MatchedMethod getBest(String name, ActionName action,
List<? extends MethodMatcher> preferred) { List<? extends MethodMatcher> preferred) {
synchronized (map) {
return map.computeIfAbsent(name, n -> chooseBest(action, preferred)); return map.computeIfAbsent(name, n -> chooseBest(action, preferred));
} }
}
private MatchedMethod chooseBest(ActionName name, List<? extends MethodMatcher> preferred) { private MatchedMethod chooseBest(ActionName name, List<? extends MethodMatcher> preferred) {
if (preferred.isEmpty()) { if (preferred.isEmpty()) {