Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-31 15:56:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0_dev747368_fix_archiveremappedheadlesstest' into Ghidra_10.3

Browse Source
This commit is contained in:
Ryan Kurtz
2023-05-04 11:47:43 -04:00
parent d48bf984eb 8923582e18
commit b3616a6831
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/archive/DefaultDataTypeArchiveService.java
+7 -2
View File
@@ -169,8 +169,13 @@ public class DefaultDataTypeArchiveService implements DataTypeArchiveService {
protected DataTypeManagerInfo addDTM(DataTypeManagerInfo dtmInfo) throws DuplicateIdException { protected DataTypeManagerInfo addDTM(DataTypeManagerInfo dtmInfo) throws DuplicateIdException {
DataTypeManagerInfo existingDTM = openDTMs.get(dtmInfo.dtm.getUniversalID()); DataTypeManagerInfo existingDTM = openDTMs.get(dtmInfo.dtm.getUniversalID());
if (existingDTM != null) { if (existingDTM != null) {
dtmInfo.dtm.close(); if (existingDTM.isClosed()) {
throw new DuplicateIdException(dtmInfo.name(), existingDTM.name()); openDTMs.remove(dtmInfo.dtm.getUniversalID());
}
else {
dtmInfo.dtm.close();
throw new DuplicateIdException(dtmInfo.name(), existingDTM.name());
}
} }
openDTMs.put(dtmInfo.dtm.getUniversalID(), dtmInfo); openDTMs.put(dtmInfo.dtm.getUniversalID(), dtmInfo);
afterAddDataTypeManager(dtmInfo); afterAddDataTypeManager(dtmInfo);