Skip to content

Add null check in ExceptionDetailsErrorDialog #3199

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
shroffk merged 1 commit into from
Nov 25, 2024
Merged

Add null check in ExceptionDetailsErrorDialog #3199

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions core/ui/src/main/java/org/phoebus/ui/Messages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class Messages
public static String DefaultNewColumnName;
/**DoNotShow */
public static String DoNotShow;

/**Format_Binary */
public static String Format_Binary;
/**Format_Compact */
Expand Down Expand Up @@ -68,6 +69,7 @@ public class Messages
public static String MoveRowDown;
/**MoveRowUp */
public static String MoveRowUp;
public static String NoExceptionAvailable;
/**NumberInputHdr */
public static String NumberInputHdr;
/**Num_Selected */
Expand Down
8 changes: 6 additions & 2 deletions core/ui/src/main/java/org/phoebus/ui/dialog/ExceptionDetailsErrorDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import javafx.scene.control.TextArea;
import javafx.scene.input.Clipboard;
import javafx.scene.input.ClipboardContent;
import org.phoebus.ui.Messages;

import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
Expand Down Expand Up @@ -91,8 +92,11 @@ public static void openError(final String title, final Exception exception)
private static void doOpenError(final Node node, final String title, final String message, final Exception exception, final boolean append_stacktrace_msgs)
{
StringBuilder messageBuilder = new StringBuilder(message).append(LINE_SEPARATOR);
if(append_stacktrace_msgs)
{

if(exception == null){
messageBuilder.append(System.lineSeparator()).append(Messages.NoExceptionAvailable);
}
else{
messageBuilder.append(exception.getMessage() != null ? exception.getMessage() : exception.getClass()).append(LINE_SEPARATOR).append("Cause:").append(LINE_SEPARATOR);
Throwable cause = exception.getCause();
int exceptionIndex = 1;
Expand Down
1 change: 1 addition & 0 deletions core/ui/src/main/resources/org/phoebus/ui/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ MoveColumnLeft=Move Column Left
MoveColumnRight=Move Column Right
MoveRowDown=Move Row Down
MoveRowUp=Move Row Up
NoExceptionAvailable=<no exception information available>
NumberInputHdr=Please enter a number
Num_Selected=selected
Redo_TT=Re-do last change
Expand Down
Loading