diff options
| author | kmoore | 2012-05-14 12:53:31 +0000 |
|---|---|---|
| committer | kmoore | 2012-05-14 12:53:31 +0000 |
| commit | d3577de0bac7fdef904ad229f596c1b5f57f5583 (patch) | |
| tree | fa8533a4134d080bdc350b6e0c2dd21e65290fb0 | |
| parent | 6363fbf59f16649103eb8ed4443f2e7fed6fdbb6 (diff) | |
| download | webtools.dali-d3577de0bac7fdef904ad229f596c1b5f57f5583.tar.gz webtools.dali-d3577de0bac7fdef904ad229f596c1b5f57f5583.tar.xz webtools.dali-d3577de0bac7fdef904ad229f596c1b5f57f5583.zip | |
378883 - NPE disposing JpaJpqlContentProposalProvider
| -rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java index 447c2d8fa0..4a82c9c368 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java @@ -399,7 +399,9 @@ public final class JpaJpqlContentProposalProvider extends JpqlCompletionProposal IWorkbench workbench = PlatformUI.getWorkbench(); IHandlerService handlerService = (IHandlerService) workbench.getService(IHandlerService.class); - handlerService.deactivateHandler(handlerActivation); + if (handlerService != null) { //this can be null if closing the workbench + handlerService.deactivateHandler(handlerActivation); + } } private KeyStroke findContentAssistTrigger() { |