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

Jump to bottom

[enocean] Fix disposal of running tasks #15329

Merged
merged 2 commits into from
Jul 31, 2023
Merged

[enocean] Fix disposal of running tasks #15329

merged 2 commits into from
Jul 31, 2023

Conversation

jlaur
Copy link
Contributor

@jlaur jlaur commented Jul 29, 2023 •
edited
Loading

@jlaur
Fix disposal of running tasks
cc1c347 
Fixes openhab#15328

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
@jlaur jlaur requested review from lsiepel and a team July 29, 2023 13:04
@jlaur jlaur requested a review from fruggy83 as a code owner July 29, 2023 13:04
@openhab-bot
Copy link
Collaborator

This pull request has been mentioned on openHAB Community. There might be relevant details there:

https://community.openhab.org/t/enocean-usb300-initialization-fails-with-oh-4-0-0-m3-and-oh-4-0-0-3512/147466/67

@jlaur jlaur added bug An unexpected problem or unintended behavior of an add-on critical labels Jul 29, 2023
@jlaur jlaur requested a review from dalgwen July 29, 2023 13:08
lsiepel
lsiepel reviewed Jul 29, 2023
View reviewed changes
Copy link
Contributor

@lsiepel lsiepel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I think just a bit too much was reverted, where applicable i left review notes. Otherwise it looks perfectly sane :-)

...n/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseActuatorHandler.java Show resolved Hide resolved
...ean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseSensorHandler.java Show resolved Hide resolved
.../src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanClassicDeviceHandler.java Show resolved Hide resolved
...enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java Show resolved Hide resolved
...enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java Show resolved Hide resolved
...enocean/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBridgeHandler.java Show resolved Hide resolved
lsiepel
lsiepel approved these changes Jul 29, 2023
View reviewed changes
Copy link
Contributor

@lsiepel lsiepel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jlaur
Make naming consistent
ba2bc20 
Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
lolodomo
lolodomo approved these changes Jul 31, 2023
View reviewed changes
Copy link
Contributor

@lolodomo lolodomo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lolodomo lolodomo merged commit a9d6d80 into openhab:main Jul 31, 2023
@lolodomo lolodomo added this to the 4.1 milestone Jul 31, 2023
@jlaur
Copy link
Contributor Author

jlaur commented Jul 31, 2023

@lolodomo - thanks. This one should also go into 4.0.2. Here are the instructions. 😉

git clone /~https://github.com/openhab/openhab-addons.git
cd openhab-addons
git checkout 4.0.x
git pull
git cherry-pick <commit hash>
git push --set-upstream origin

@jlaur jlaur deleted the 15328-enocean-fix-scheduled-jobs branch July 31, 2023 15:24
@jlaur jlaur linked an issue Jul 31, 2023 that may be closed by this pull request
[Enocean] Bridge goes offline after a while #15330
Closed
@jlaur
Copy link
Contributor Author

jlaur commented Aug 8, 2023

@openhab/add-ons-maintainers - gentle ping to not be forgotten for 4.0.2.

@wborn
Copy link
Member

wborn commented Aug 9, 2023

Go ahead and cherry pick it. 🙂

jlaur added a commit that referenced this pull request Aug 9, 2023
@jlaur
[enocean] Fix disposal of running tasks (#15329)
cd4d66c 
* Fix disposal of running tasks

Fixes #15328

---------

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
@jlaur jlaur added the patch A PR that has been cherry-picked to a patch release branch label Aug 9, 2023
@jlaur jlaur mentioned this pull request Jan 18, 2024
Merged
austvik pushed a commit to austvik/openhab-addons that referenced this pull request Mar 27, 2024
@jlaur @austvik
[enocean] Fix disposal of running tasks (openhab#15329)
50ed287 
* Fix disposal of running tasks

Fixes openhab#15328

---------

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
@jlaur jlaur mentioned this pull request Jul 14, 2024
Closed
@jlaur jlaur mentioned this pull request Dec 21, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lsiepel lsiepel lsiepel approved these changes

@lolodomo lolodomo lolodomo approved these changes

@fruggy83 fruggy83 Awaiting requested review from fruggy83 fruggy83 is a code owner

@dalgwen dalgwen Awaiting requested review from dalgwen

Assignees
No one assigned
Labels
bug An unexpected problem or unintended behavior of an add-on critical patch A PR that has been cherry-picked to a patch release branch
Projects
None yet
Milestone
4.1
5 participants
@jlaur @openhab-bot @wborn @lolodomo @lsiepel