|
@@ -41,9 +41,13 @@ public class AlarmWebSocketCache {
|
|
|
Set<String> resultSet = new HashSet<>();
|
|
|
synchronized (resultSet) {
|
|
|
// 结果集中一定包含接收所有项目消息的通道
|
|
|
- resultSet.addAll(projectSessionIds.get(AlarmWebSocketCache.allProjects));
|
|
|
+ if (projectSessionIds.get(AlarmWebSocketCache.allProjects) != null) {
|
|
|
+ resultSet.addAll(projectSessionIds.get(AlarmWebSocketCache.allProjects));
|
|
|
+ }
|
|
|
if (StringUtils.isNotEmpty(projectId)) {
|
|
|
- resultSet.addAll(projectSessionIds.get(projectId));
|
|
|
+ if (projectSessionIds.get(projectId) != null) {
|
|
|
+ resultSet.addAll(projectSessionIds.get(projectId));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return resultSet;
|