Controller.Api.Backend: catch possible exception in collectData()

OpenEMS · Mar 9, 2021 · 941ac94 · 941ac94
1 parent 3315bbb
commit 941ac94
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/...oller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java b/...oller.api.backend/src/io/openems/edge/controller/api/backend/SendChannelValuesWorker.java
@@ -108,15 +108,21 @@ public void deactivate() {
 	 * @return collected data
 	 */
 	private ImmutableTable<String, String, JsonElement> collectData(List<OpenemsComponent> enabledComponents) {
-		return enabledComponents.parallelStream() //
-				.flatMap(component -> component.channels().parallelStream()) //
-				.filter(channel -> // Ignore WRITE_ONLY Channels
-				channel.channelDoc().getAccessMode() != AccessMode.WRITE_ONLY //
-						// Ignore Low-Priority Channels
-						&& channel.channelDoc().getPersistencePriority()
-								.isAtLeast(this.parent.config.persistencePriority()))
-				.collect(ImmutableTable.toImmutableTable(c -> c.address().getComponentId(),
-						c -> c.address().getChannelId(), c -> c.value().asJson()));
+		try {
+			return enabledComponents.parallelStream() //
+					.flatMap(component -> component.channels().parallelStream()) //
+					.filter(channel -> // Ignore WRITE_ONLY Channels
+					channel.channelDoc().getAccessMode() != AccessMode.WRITE_ONLY //
+							// Ignore Low-Priority Channels
+							&& channel.channelDoc().getPersistencePriority()
+									.isAtLeast(this.parent.config.persistencePriority()))
+					.collect(ImmutableTable.toImmutableTable(c -> c.address().getComponentId(),
+							c -> c.address().getChannelId(), c -> c.value().asJson()));
+		} catch (Exception e) {
+			// ConcurrentModificationException can happen if Channels are dynamically added
+			// or removed
+			return ImmutableTable.of();
+		}
 	}
 
 	/*