Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hue] Eliminate NPE in #9985 #10199

Merged
merged 11 commits into from
Feb 19, 2021
Merged

[hue] Eliminate NPE in #9985 #10199

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f6b0794
[hue] implement PR #2144 in openhab.core
andrewfg Jan 25, 2021
7d88bfd
[hue] add binding configuration parameter; return long
andrewfg Jan 30, 2021
f553546
[hue] readme
andrewfg Jan 30, 2021
c08cab1
[hue] remove configurationPid hack
andrewfg Feb 1, 2021
7082733
[hue] use constructor injection
andrewfg Feb 7, 2021
710e156
[hue] binding.xml element attributes
andrewfg Feb 7, 2021
52a2334
[hue] adopt reviewer suggestions
andrewfg Feb 9, 2021
0f1d889
[hue] extra null check
andrewfg Feb 19, 2021
ea12f94
Merge branch 'main' into hue-grace_period
andrewfg Feb 19, 2021
345e251
Merge branch 'main' into hue-grace_period
andrewfg Feb 19, 2021
80b2d74
Merge branch 'hue-grace_period' of https://github.com/andrewfg/openha…
andrewfg Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...c/main/java/org/openhab/binding/hue/internal/discovery/HueBridgeDiscoveryParticipant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,11 @@ public long getRemovalGracePeriodSeconds(RemoteDevice device) {
try {
Configuration conf = configAdmin.getConfiguration("binding.hue");
Dictionary<String, @Nullable Object> properties = conf.getProperties();
Object property = properties.get(HueBindingConstants.REMOVAL_GRACE_PERIOD);
if (property != null) {
removalGracePeriodSeconds = Long.parseLong(property.toString());
if (properties != null) {
Object property = properties.get(HueBindingConstants.REMOVAL_GRACE_PERIOD);
if (property != null) {
removalGracePeriodSeconds = Long.parseLong(property.toString());
}
}
} catch (IOException | IllegalStateException | NumberFormatException e) {
// fall through to pre-initialised (default) value
Expand Down