diff options
| author | Dani Megert | 2016-08-19 12:33:59 +0000 |
|---|---|---|
| committer | Dani Megert | 2016-08-19 12:33:59 +0000 |
| commit | 23e01242dfe21800d196e8d805735cd4a23f2f96 (patch) | |
| tree | c4ce90b9c88a05a5a20ec5df4270b473a865abfa | |
| parent | 89a815459ef514815d47e2608b3d48fce49125fa (diff) | |
| download | eclipse.platform.text-23e01242dfe21800d196e8d805735cd4a23f2f96.tar.gz eclipse.platform.text-23e01242dfe21800d196e8d805735cd4a23f2f96.tar.xz eclipse.platform.text-23e01242dfe21800d196e8d805735cd4a23f2f96.zip | |
Fixed bug 499980: Potential NPE below CompletionProposalPopup.computeProposals if no proposals possible
| -rw-r--r-- | org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java index 4c8a67df637..bfafd2278d2 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java @@ -556,6 +556,8 @@ class CompletionProposalPopup implements IContentAssistListener { proposals= fContentAssistant.computeCompletionProposals(fContentAssistSubjectControl, offset); } else { proposals= fContentAssistant.computeCompletionProposals(fViewer, offset); + if (proposals == null) + return new ICompletionProposal[] {}; } if (fSorter != null) { sortProposals(proposals); |