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

Ensure managed provider is unset by registered provider (#1506)

Browse Source 
Signed-off-by: Chris Jackson <chris@cd-jackson.com>
This commit is contained in:
Chris Jackson 2020-06-01 00:28:25 +01:00 committed by GitHub
parent 5b325aa3d2
commit 795a19249c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bundles/org.openhab.core/src/main/java/org/openhab/core/common/registry/AbstractRegistry.java
View File

@ -48,8 +48,11 @@ import org.slf4j.LoggerFactory;
* @author Kai Kreuzer - switched to parameterized logging * @author Kai Kreuzer - switched to parameterized logging
* @author Hilbrand Bouwkamp - Made protected fields private and added new methods to give access. * @author Hilbrand Bouwkamp - Made protected fields private and added new methods to give access.
* @author Markus Rathgeb - Use separate collections to improve performance * @author Markus Rathgeb - Use separate collections to improve performance
* @author Chris Jackson - Ensure managed provider is only unset by current provider
* *
* @param <E> type of the element * @param <E> type of the element
* @param <K> type of the key
* @param <P> type of the provider
*/ */
@NonNullByDefault @NonNullByDefault
public abstract class AbstractRegistry<@NonNull E extends Identifiable<K>, @NonNull K, @NonNull P extends Provider<E>> public abstract class AbstractRegistry<@NonNull E extends Identifiable<K>, @NonNull K, @NonNull P extends Provider<E>>
@ -530,7 +533,9 @@ public abstract class AbstractRegistry<@NonNull E extends Identifiable<K>, @NonN
} }
protected void unsetManagedProvider(ManagedProvider<E, K> provider) { protected void unsetManagedProvider(ManagedProvider<E, K> provider) {
managedProvider = Optional.empty(); if (managedProvider.equals(provider)) {
managedProvider = Optional.empty();
}
} }
/** /**