Skip to content

Commit cc95a6d

Browse files
authored
Fix NPE in FolderObserver (#4896)
Fix #4890 Signed-off-by: Laurent Garnier <lg.hc@free.fr>
1 parent 69bb634 commit cc95a6d

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

  • bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder

bundles/org.openhab.core.model.core/src/main/java/org/openhab/core/model/core/internal/folder/FolderObserver.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.HashMap;
2525
import java.util.HashSet;
2626
import java.util.Map;
27+
import java.util.Objects;
2728
import java.util.Set;
2829
import java.util.concurrent.ConcurrentHashMap;
2930
import java.util.stream.Collectors;
@@ -113,7 +114,8 @@ protected void removeModelParser(ModelParser modelParser) {
113114
parsers.remove(extension);
114115

115116
Set<String> removed = modelRepository.removeAllModelsOfType(extension);
116-
ignoredPaths.addAll(removed.stream().map(namePathMap::get).collect(Collectors.toSet()));
117+
ignoredPaths
118+
.addAll(removed.stream().map(namePathMap::get).filter(Objects::nonNull).collect(Collectors.toSet()));
117119
}
118120

119121
@Activate

0 commit comments

Comments
 (0)