Skip to content

CSSTUDIO-3463 Bugfix: Don't assume that value_prop.getValue() returns a value of type VType. #3561

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

Merged
merged 1 commit into from
Sep 30, 2025
Merged

CSSTUDIO-3463 Bugfix: Don't assume that value_prop.getValue() returns a value of type VType. #3561

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions .../org/csstudio/display/builder/representation/javafx/widgets/RegionBaseRepresentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,25 +258,26 @@ private void connectionOrValueChanged(final WidgetProperty<?> property, final Ob
if (!model_widget.runtimePropConnected().getValue()) {
severity = AlarmSeverity.UNDEFINED;
}
else if (value_prop != null && alarm_sensitive_border_prop.getValue())
{
else if (value_prop != null && alarm_sensitive_border_prop.getValue()) {
// Reflect severity of primary PV's value
final VType value = value_prop.getValue();
final Alarm alarm = Alarm.alarmOf(value);
final Object object = value_prop.getValue();
final Alarm alarm = Alarm.alarmOf(object);

if (alarm.equals(Alarm.disconnected())) {
severity = AlarmSeverity.UNDEFINED;
} else if (alarm != null && alarm.getSeverity() != AlarmSeverity.NONE) {
// Have alarm info
severity = alarm.getSeverity();
} else if (object instanceof VType) {
// VType that doesn't provide alarm, always OK
severity = AlarmSeverity.NONE;
} else if (object != null) {
// Not a vtype, but non-null, assume OK
severity = AlarmSeverity.NONE;
} else { // null
severity = AlarmSeverity.UNDEFINED;
}
else {
if (alarm != null && alarm.getSeverity() != AlarmSeverity.NONE)
// Have alarm info
severity = alarm.getSeverity();
else if (value != null)
// VType that doesn't provide alarm, always OK
severity = AlarmSeverity.NONE;
else // null
severity = AlarmSeverity.UNDEFINED;
}

}

// Any change?
Expand Down