Skip to content

CSSTDUIO-3408 Bugfix: Add null-check for value_prop before calling value_prop.getValue() #3522

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
Aug 29, 2025
Merged

CSSTDUIO-3408 Bugfix: Add null-check for value_prop before calling value_prop.getValue() #3522

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
19 changes: 12 additions & 7 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 @@ -255,14 +255,19 @@ private void connectionOrValueChanged(final WidgetProperty<?> property, final Ob
AlarmSeverity severity = AlarmSeverity.NONE;

// Ignore custom border and value of primary PV, show disconnected
final VType value = value_prop.getValue();
final Alarm alarm = Alarm.alarmOf(value);
if (! model_widget.runtimePropConnected().getValue() || alarm.equals(Alarm.disconnected()))
if (!model_widget.runtimePropConnected().getValue()) {
severity = AlarmSeverity.UNDEFINED;
else
{ // Reflect severity of primary PV's value
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);

if (alarm.equals(Alarm.disconnected())) {
severity = AlarmSeverity.UNDEFINED;
}
else {
if (alarm != null && alarm.getSeverity() != AlarmSeverity.NONE)
// Have alarm info
severity = alarm.getSeverity();
Expand Down