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

[JBPM-10188] Signaling process instances #2319

Merged
merged 1 commit into from
Aug 31, 2023
Merged

[JBPM-10188] Signaling process instances #2319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,10 +622,9 @@ protected void registerExternalEventNodeListeners() {
for (Node node : getWorkflowProcess().getNodes()) {
if (node instanceof EventNode && "external".equals(((EventNode) node).getScope())) {
String eventType = ((EventNode) node).getType();
addEventListener(eventType, EMPTY_EVENT_LISTENER, true);
if (isVariableExpression(eventType)) {
addEventListener(resolveVariable(eventType), EMPTY_EVENT_LISTENER, true);
} else {
addEventListener(eventType, EMPTY_EVENT_LISTENER, true);
}
} else if (node instanceof EventSubProcessNode) {
List<String> events = ((EventSubProcessNode) node).getEvents();
Expand All @@ -648,10 +647,9 @@ private void unregisterExternalEventNodeListeners() {
for (Node node : getWorkflowProcess().getNodes()) {
if (node instanceof EventNode && "external".equals(((EventNode) node).getScope())) {
String eventType = ((EventNode) node).getType();
removeEventListener(eventType, EMPTY_EVENT_LISTENER, true);
if (isVariableExpression(eventType)) {
removeEventListener(resolveVariable(eventType), EMPTY_EVENT_LISTENER, true);
} else {
removeEventListener(eventType, EMPTY_EVENT_LISTENER, true);
}
}
}
Expand Down Expand Up @@ -909,7 +907,6 @@ private Optional<Object> resolveExpressionVariable(String paramName, VariableRes
if(factory.isResolveable(paramName)) {
return Optional.of(factory.getVariableResolver(paramName).getValue());
}

return Optional.ofNullable(MVELSafeHelper.getEvaluator().eval(paramName, factory));
} catch (Throwable t) {
logger.error("Could not find variable scope for variable {}", paramName);
Expand Down