demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

model.core: respect OSGi lifecycle (#592)

Browse Source 
Fixes: https://github.com/openhab/openhab-core/issues/591

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
This commit is contained in:
Markus Rathgeb 2019-02-21 09:13:54 +00:00 committed by Wouter Born
parent 32bee0e22c
commit 45858f2dd2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.core.model.core/src/main/java/org/eclipse/smarthome/model/core/internal/folder/FolderObserver.java
View File

@ -98,8 +98,10 @@ public class FolderObserver extends AbstractWatchService {
protected void removeModelParser(ModelParser modelParser) {
parsers.remove(modelParser.getExtension());
Set<String> removed = modelRepo.removeAllModelsOfType(modelParser.getExtension());
ignoredFiles.addAll(removed.stream().map(name -> nameFileMap.get(name)).collect(Collectors.toSet()));
if (modelRepo != null) {
Set<String> removed = modelRepo.removeAllModelsOfType(modelParser.getExtension());
ignoredFiles.addAll(removed.stream().map(name -> nameFileMap.get(name)).collect(Collectors.toSet()));
}
}
@Activate