Update Content app nullptrs

project-chip · Jun 24, 2024 · 8bf7d58 · 8bf7d58
1 parent 04a996d
commit 8bf7d58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.../tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/model/ContentApp.java b/.../tv-app/android/App/platform-app/src/main/java/com/matter/tv/server/model/ContentApp.java
@@ -67,7 +67,7 @@ public void setEndpointId(int endpoint) {
   }
 
   public Set<SupportedCluster> getSupportedClusters() {
-    return Collections.unmodifiableSet(supportedClusters);
+    return supportedClusters != null ? Collections.unmodifiableSet(supportedClusters) : Collections.EMPTY_SET;
   }
 
   public String getVersion() {

diff --git a/...droid/App/platform-app/src/main/java/com/matter/tv/server/service/AppPlatformService.java b/...droid/App/platform-app/src/main/java/com/matter/tv/server/service/AppPlatformService.java
@@ -198,6 +198,7 @@ private Collection<ContentAppSupportedCluster> mapSupportedClusters(
       Collection<SupportedCluster> supportedClusters) {
     return supportedClusters
         .stream()
+        .filter(Objects::nonNull)
         .map(AppPlatformService::mapSupportedCluster)
         .collect(Collectors.toList());
   }