Skip to content

Check for nativeImagePath property. #3345

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
entlicher merged 1 commit into from
Nov 30, 2021
Merged

Check for nativeImagePath property. #3345

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
10 changes: 9 additions & 1 deletion ...ver/src/org/netbeans/modules/java/lsp/server/debugging/attach/NbAttachRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.netbeans.modules.java.lsp.server.protocol.NbCodeLanguageClient;
import org.netbeans.modules.java.nativeimage.debugger.api.NIDebugRunner;
import org.netbeans.modules.nativeimage.api.debug.NIDebugger;
import org.openide.util.NbBundle;
import org.openide.util.NbBundle.Messages;
import org.openide.util.RequestProcessor;

Expand Down Expand Up @@ -82,6 +83,7 @@ public CompletableFuture<Void> attach(Map<String, Object> attachArguments, Debug
}
}

@NbBundle.Messages("MSG_UnknownNIPath=Unknown native image path. Please set `nativeImagePath`.")
private CompletableFuture<Void> attachToNative(Map<String, Object> attachArguments, DebugAdapterContext context) {
CompletableFuture<Void> resultFuture = new CompletableFuture<>();
String processAndExe = (String) attachArguments.get("processId"); // NOI18N
Expand All @@ -92,11 +94,17 @@ private CompletableFuture<Void> attachToNative(Map<String, Object> attachArgumen
try {
if (index > 0) {
processId = Long.parseLong(processAndExe.substring(0, index));
if (nativeImagePath.isEmpty()) {
if (nativeImagePath == null || nativeImagePath.isEmpty()) {
nativeImagePath = processAndExe.substring(index + 1);
}
} else {
processId = Long.parseLong(processAndExe);
if (nativeImagePath == null) {
ErrorUtilities.completeExceptionally(resultFuture,
Bundle.MSG_UnknownNIPath(),
ResponseErrorCode.serverErrorStart);
return resultFuture;
}
}
String executable = nativeImagePath;
RP.post(() -> attachNativeDebug(new File(executable), processId, miDebugger, context, resultFuture));
Expand Down