demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 21:31:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Keep persisted disabled status when thing is removed (#493)

Browse Source 
Also-By: Florian Stolte <fstolte@itemis.de>
Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer 2019-01-30 11:37:51 +01:00 committed by Christoph Weitkamp
parent 5e2e7b1e16
commit 3b6dfbeddb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerImpl.java
View File

@ -484,7 +484,6 @@ public class ThingManagerImpl
} }
} }
storage.remove(thing.getUID().getAsString());
this.things.remove(thing); this.things.remove(thing);
} }

6
itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java
View File

@ -913,7 +913,7 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest {
} }
@Test @Test
public void testStorageEntryRemovedOnThingRemoval() throws Exception { public void testStorageEntryRetainedOnThingRemoval() throws Exception {
registerThingTypeProvider(); registerThingTypeProvider();
AtomicReference<ThingHandlerCallback> thingHandlerCallback = new AtomicReference<>(); AtomicReference<ThingHandlerCallback> thingHandlerCallback = new AtomicReference<>();
@ -981,8 +981,10 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest {
new Thread((Runnable) () -> managedThingProvider.remove(THING.getUID())).start(); new Thread((Runnable) () -> managedThingProvider.remove(THING.getUID())).start();
waitForAssert(() -> { waitForAssert(() -> {
assertThat(storage.containsKey(THING_UID.getAsString()), is(false)); assertThat(thingRegistry.get(THING.getUID()), is(equalTo(null)));
}, SafeCaller.DEFAULT_TIMEOUT - 100, 50); }, SafeCaller.DEFAULT_TIMEOUT - 100, 50);
assertThat(storage.containsKey(THING_UID.getAsString()), is(true));
} }
private void assertThingStatus(Map<String, Object> propsThing, Map<String, Object> propsChannel, ThingStatus status, private void assertThingStatus(Map<String, Object> propsThing, Map<String, Object> propsChannel, ThingStatus status,