Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bugfix] Fixed two bugs in CachedElementMap 

First bug was a situation where the update() method returned a list of
null elements due to removing and then trying to "replace" the existing
element.

Then fixed a bug where when an element was removed its ID was not
removed the key set.
This commit is contained in:
Robert von Burg 2014-03-10 22:33:22 +01:00
parent c7cb42724e
commit 2894b5b157
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/li/strolch/agent/impl/CachedElementMap.java
View File

@ -305,11 +305,13 @@ public abstract class CachedElementMap<T extends StrolchElement> implements Elem
synchronized (byType) {
for (T element : list) {
if (byType.remove(element.getId()) == null) {
T replacedElement = byType.remove(element.getId());
if (replacedElement == null) {
msg = MessageFormat.format(msg, element.getLocator());
throw new StrolchPersistenceException(msg);
}
replacedElements.add(byType.put(element.getId(), element));
byType.put(element.getId(), element);
replacedElements.add(replacedElement);
}
}
}
@ -350,6 +352,7 @@ public abstract class CachedElementMap<T extends StrolchElement> implements Elem
msg = MessageFormat.format(msg, element.getLocator());
throw new StrolchPersistenceException(msg);
}
this.allKeys.remove(element.getId());
if (byType.isEmpty()) {
synchronized (this.elementMap) {