lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #264 from bsinno/fix_concurrency_on_UI_causes_NullpointerException

Browse Source 
Fix for the concurrency issue on UI causes on the Nullpointer Exception.
This commit is contained in:
Michael Hirsch
2016-08-08 08:49:21 +02:00
committed by GitHub
parent d53517a0c9 88c1253f66
commit c4b0bdfa86
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java
View File

@@ -12,6 +12,7 @@ import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
@@ -54,7 +55,7 @@ public abstract class AbstractTagToken<T extends BaseEntity> implements Serializ
protected IndexedContainer container; protected IndexedContainer container;
protected final transient Map<Long, TagData> tagDetails = new HashMap<>(); protected final transient Map<Long, TagData> tagDetails = new ConcurrentHashMap<>();
protected final transient Map<Long, TagData> tokensAdded = new HashMap<>(); protected final transient Map<Long, TagData> tokensAdded = new HashMap<>();
@@ -140,10 +141,12 @@ public abstract class AbstractTagToken<T extends BaseEntity> implements Serializ
} }
protected void setContainerPropertValues(final Long tagId, final String tagName, final String tagColor) { protected void setContainerPropertValues(final Long tagId, final String tagName, final String tagColor) {
tagDetails.put(tagId, new TagData(tagId, tagName, tagColor)); final TagData tagData = tagDetails.putIfAbsent(tagId, new TagData(tagId, tagName, tagColor));
final Item item = container.addItem(tagId); if(tagData == null){
item.getItemProperty("id").setValue(tagId); final Item item = container.addItem(tagId);
updateItem(tagName, tagColor, item); item.getItemProperty("id").setValue(tagId);
updateItem(tagName, tagColor, item);
}
} }
protected void updateItem(final String tagName, final String tagColor, final Item item) { protected void updateItem(final String tagName, final String tagColor, final Item item) {