Skip to content

Bugfix/54#websockets #55

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

Closed
pLeminoq wants to merge 2 commits into from
Closed

Bugfix/54#websockets #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60e7372
try to avoid deadlock by moving notifyScheduledActionList into action…
DivineThreepwood Feb 8, 2022
b39392f
add missing spring dependency for websockets to work
pLeminoq Feb 22, 2022
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
3 changes: 3 additions & 0 deletions module/api/graphql/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ dependencies {
exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
}
api("org.springframework.boot:spring-boot-starter-jetty:_")
implementation("org.springframework.boot:spring-boot-starter-websocket:_") {
exclude(group = "org.springframework.boot", module = "spring-boot-starter-tomcat")
}
api(Spring.boot.webflux)
api("org.springframework:spring-webmvc:_")

Expand Down
10 changes: 5 additions & 5 deletions module/dal/control/src/main/java/org/openbase/bco/dal/control/action/ActionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,11 @@ private void updateActionState(final ActionState.State state) throws Interrupted
actionDescriptionBuilder.setTerminationTimestamp(TimestampProcessor.getCurrentTimestamp());
}

// make sure that state changes to finishing states, scheduled and executing always trigger a notification
if (isNotifiedActionState(state)) {
unit.notifyScheduledActionList();
}

} finally {
actionDescriptionBuilderLock.writeLock().unlock();
}
Expand All @@ -788,11 +793,6 @@ private void updateActionState(final ActionState.State state) throws Interrupted
synchronized (executionStateChangeSync) {
executionStateChangeSync.notifyAll();
}

// make sure that state changes to finishing states, scheduled and executing always trigger a notification
if (isNotifiedActionState(state)) {
unit.notifyScheduledActionList();
}
}

private void validateStateTransition(final ActionState.State state) throws InvalidStateException {
Expand Down
2 changes: 2 additions & 0 deletions versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ version.org.springframework.boot..spring-boot-starter-webflux=2.6.3

version.org.springframework.boot..spring-boot-starter-jetty=2.6.3

version.org.springframework.boot..spring-boot-starter-websocket=2.6.3

version.org.springframework..spring-webmvc=5.3.15

version.org.openhab.core.bundles..org.openhab.core.io.rest.core=3.1.0
Expand Down