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

Merge remote-tracking branch 'origin/GP-4680_dev747368_add_synchs_to_fix_concurrentmodexcpt--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-06-12 11:20:11 -04:00
commit 5924339c82
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Ghidra/Framework/Project/src/main/java/ghidra/framework/data/DefaultProjectData.java
View File

@ -686,12 +686,20 @@ public class DefaultProjectData implements ProjectData {
}
public void releaseDomainFiles(Object consumer) {
for (DomainObjectAdapter domainObj : openDomainObjects.values()) {
try {
List<DomainObjectAdapter> matchingObjs = new ArrayList<>();
synchronized (this) {
for (DomainObjectAdapter domainObj : openDomainObjects.values()) {
if (domainObj.getConsumerList().contains(consumer)) {
domainObj.release(consumer);
matchingObjs.add(domainObj);
}
}
}
// release consumers outside of synch block
for (DomainObjectAdapter domainObj : matchingObjs) {
try {
domainObj.release(consumer);
}
catch (IllegalArgumentException e) {
// ignore
}
@ -703,7 +711,7 @@ public class DefaultProjectData implements ProjectData {
* @param list the list to receive the changed domain files
*/
@Override
public void findOpenFiles(List<DomainFile> list) {
public synchronized void findOpenFiles(List<DomainFile> list) {
for (DomainObjectAdapter domainObj : openDomainObjects.values()) {
list.add(domainObj.getDomainFile());
}