demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2026-07-29 12:34:22 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix ConcurrentModificationException in AutomationIntegrationTest (#1147)

Browse Source 
When waitForAssert uses ruleEvents.stream() the ruleEventHandler may add an event to ruleEvents at the same time causing a ConcurrentModificationException.
Using a CopyOnWriteArrayList instead of an ArrayList should fix this.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2019-10-19 15:13:48 +02:00
committed by Kai Kreuzer
parent 42a0217386
commit aa4456425a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
itests/org.openhab.core.automation.integration.tests/src/main/java/org/openhab/core/automation/integration/test/AutomationIntegrationTest.java
+2 -3
View File
@@ -16,7 +16,6 @@ import static java.util.stream.Collectors.*;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -27,6 +26,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.stream.Stream;
import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -268,7 +268,6 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
inputs.put("topic", "ItemStateChangeTrigger.topic");
inputs.put("event", "ItemStateChangeTrigger.event");
// def conditionInputs=[topicConnection] as Set
List<Condition> conditions = Collections.singletonList(
ModuleBuilder.createCondition().withId("EventCondition_2").withTypeUID("core.GenericEventCondition")
.withConfiguration(condition1Config).withInputs(inputs).build());
@@ -282,7 +281,7 @@ public class AutomationIntegrationTest extends JavaOSGiTest {
logger.info("Rule created and added: {}", rule.getUID());
List<RuleStatusInfoEvent> ruleEvents = new ArrayList<>();
List<RuleStatusInfoEvent> ruleEvents = new CopyOnWriteArrayList<>();
@NonNullByDefault
EventSubscriber ruleEventHandler = new EventSubscriber() {