Skip to content

Scan 'script' command: Add exception message to error #2994

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
kasemir merged 1 commit into from
Apr 4, 2024
Merged

Scan 'script' command: Add exception message to error #2994

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
5 changes: 4 additions & 1 deletion services/scan-server/src/main/java/org/csstudio/scan/server/internal/JythonSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2012-2020 Oak Ridge National Laboratory.
* Copyright (c) 2012-2024 Oak Ridge National Laboratory.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -211,6 +211,9 @@ public <T> T loadClass(final Class<T> type, final String class_name, final Strin
public static String getExceptionMessage(final PyException ex)
{
final StringBuilder buf = new StringBuilder();
if (ex.getLocalizedMessage() != null)
buf.append(" ").append(ex.getLocalizedMessage());

if (ex.value instanceof PyString)
buf.append(" ").append(ex.value.asString());
else if (ex.getCause() != null)
Expand Down