Handle not set workspace target in TargetDefinitionActivationCodeMining

eclipse-pde · Oct 16, 2024 · 7be24be · 7be24be
1 parent e88c916
commit 7be24be
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/...ernal/genericeditor/target/extension/codemining/TargetDefinitionActivationCodeMining.java b/...ernal/genericeditor/target/extension/codemining/TargetDefinitionActivationCodeMining.java
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2018, 2019 vogella GmbH and others
+ * Copyright (c) 2018, 2024 vogella GmbH and others
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -67,11 +67,10 @@ protected CompletableFuture<Void> doResolve(ITextViewer viewer, IProgressMonitor
 			}
 			boolean isCurrent = false;
 			try {
-				ITargetPlatformService service = acquireTargetPlatformService();
-				String memento = service.getWorkspaceTargetHandle().getMemento();
-				ITargetHandle targetHandle = getTargetHandle();
-				String targetMemento = targetHandle.getMemento();
-				isCurrent = Objects.equals(memento, targetMemento);
+				ITargetHandle workspaceTarget = acquireTargetPlatformService().getWorkspaceTargetHandle();
+				if (workspaceTarget != null) {
+					isCurrent = Objects.equals(workspaceTarget.getMemento(), getTargetHandle().getMemento());
+				}
 			} catch (CoreException e) {
 				// Caught with default message shown
 			}