diff options
| author | Pierre-Charles David | 2016-11-27 13:58:42 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2016-12-13 09:03:32 +0000 |
| commit | 6048c9303ed9e23a1bc3be1f8cf85657d4b72fb9 (patch) | |
| tree | e11f0409c8dff9cc26e02c8983409ac574da99d9 | |
| parent | 46ae574279bb56e16a72b365c03df2c61ed1b068 (diff) | |
| download | org.eclipse.sirius-6048c9303ed9e23a1bc3be1f8cf85657d4b72fb9.tar.gz org.eclipse.sirius-6048c9303ed9e23a1bc3be1f8cf85657d4b72fb9.tar.xz org.eclipse.sirius-6048c9303ed9e23a1bc3be1f8cf85657d4b72fb9.zip | |
[508248] Fix potential NPE in WorkspaceAndPluginsResourceDialog
Bug: 508248
Change-Id: I30757776bcdff2469741db334ac25cb430bf3eca
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/presentation/WorkspaceAndPluginsResourceDialog.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/presentation/WorkspaceAndPluginsResourceDialog.java b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/presentation/WorkspaceAndPluginsResourceDialog.java index 07c805b774..ba9b50be28 100644 --- a/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/presentation/WorkspaceAndPluginsResourceDialog.java +++ b/plugins/org.eclipse.sirius.editor/src/org/eclipse/sirius/editor/tools/internal/presentation/WorkspaceAndPluginsResourceDialog.java @@ -33,6 +33,7 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.pde.core.target.ITargetDefinition; +import org.eclipse.pde.core.target.ITargetHandle; import org.eclipse.pde.core.target.ITargetPlatformService; import org.eclipse.pde.core.target.TargetBundle; import org.eclipse.sirius.common.tools.api.resource.ImageFileFormat; @@ -250,7 +251,10 @@ public class WorkspaceAndPluginsResourceDialog extends ElementTreeSelectionDialo ITargetDefinition td = null; if (service != null) { try { - td = service.getWorkspaceTargetHandle().getTargetDefinition(); + ITargetHandle handle = service.getWorkspaceTargetHandle(); + if (handle != null) { + td = handle.getTargetDefinition(); + } } catch (CoreException e) { } } |
