Skip to content

Commit 9241921

Browse files
authored
Merge pull request #424 from Achal1607/fix-nb-tests
Added null pointer check for client capabilities
2 parents 4ebfa9b + aeaec3a commit 9241921

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

patches/nb-telemetry.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ index 9134992f5f..f070fec320 100644
413413
if (caps == null) {
414414
caps = new ClientCapabilities();
415415
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
416-
index 13cbcdd628..4b02a84c8b 100644
416+
index 13cbcdd628..747d151600 100644
417417
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
418418
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/Server.java
419419
@@ -164,7 +164,6 @@ public final class Server {
@@ -445,7 +445,7 @@ index 13cbcdd628..4b02a84c8b 100644
445445
public CompletableFuture<InitializeResult> initialize(InitializeParams init) {
446446
NbCodeClientCapabilities capa = NbCodeClientCapabilities.get(init);
447447
client.setClientCaps(capa);
448-
+ if (capa.wantsTelemetryEnabled()) {
448+
+ if (capa != null && capa.wantsTelemetryEnabled()) {
449449
+ LspServerTelemetryManager.getInstance().connect(client, lspSession.getLspServer().getRunningFuture());
450450
+ }
451451
hackConfigureGroovySupport(capa);

0 commit comments

Comments
 (0)