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

oops

Browse source
This commit is contained in:
ghidravore 2020-02-11 18:13:55 -05:00
parent ab0b4e02df
commit 4ce56458b8
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/data/CategoryDB.java
View file

@ -657,7 +657,8 @@ class CategoryDB extends DatabaseObject implements Category {
/** /**
* Creates a map of all data types whose name has a .conflict suffix where the key * Creates a map of all data types whose name has a .conflict suffix where the key
* is the base name and {@link LazyLoadingCachingMap} the value is a map of actual name to data type. This mapping is * is the base name and {@link LazyLoadingCachingMap} the value is a map of actual name
* to data type. This mapping is
* maintained as a lazy cache map. This is only called by the super class when the * maintained as a lazy cache map. This is only called by the super class when the
* cached needs to be populated and we are depending on it to acquire the necessary * cached needs to be populated and we are depending on it to acquire the necessary
* database lock. (See {@link LazyLoadingCachingMap#loadMap()} * database lock. (See {@link LazyLoadingCachingMap#loadMap()}
@ -671,8 +672,8 @@ class CategoryDB extends DatabaseObject implements Category {
String dataTypeName = dataType.getName(); String dataTypeName = dataType.getName();
if (isConflictName(dataTypeName)) { if (isConflictName(dataTypeName)) {
String baseName = getBaseName(dataTypeName); String baseName = getBaseName(dataTypeName);
Map<String, DataType> innerMap = map.get(baseName); Map<String, DataType> innerMap =
map.computeIfAbsent(baseName, b -> new HashMap<>()); map.computeIfAbsent(baseName, b -> new HashMap<>());
innerMap.put(dataTypeName, dataType); innerMap.put(dataTypeName, dataType);
} }
} }