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

Merge remote-tracking branch 'origin/GP-0_Dan_testFixes-2025-04-14-1'

Browse source
This commit is contained in:
Ryan Kurtz 2025-04-14 09:20:40 -04:00
commit 5fb58661b9
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Debug/ProposedUtils/src/main/java/generic/depends/DependentServiceResolver.java
View file

@ -144,7 +144,9 @@ public class DependentServiceResolver<T> {
constructed.put(cons.method, service); constructed.put(cons.method, service);
} }
instancesByClass.put(cons.cls, service); instancesByClass.put(cons.cls, service);
for (Field f : fieldsByClass.remove(cons.cls)) { Set<Field> fields = fieldsByClass.remove(cons.cls);
if (fields != null) {
for (Field f : fields) {
try { try {
f.set(obj, service); f.set(obj, service);
} }
@ -153,6 +155,7 @@ public class DependentServiceResolver<T> {
} }
} }
} }
}
if (!fieldsByClass.isEmpty()) { if (!fieldsByClass.isEmpty()) {
throw new ServiceConstructionException( throw new ServiceConstructionException(
"No service constructor for " + fieldsByClass.keySet(), null); "No service constructor for " + fieldsByClass.keySet(), null);