Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2016-08-19 12:47:26 +0000
committerDani Megert2016-08-19 12:47:26 +0000
commit44d03aad38b002ebb13e47f0c67e74e2090ca598 (patch)
tree8a51e3c6254b4f5cad16f7debd9e0d0fc25aa06f /org.eclipse.jface.text
parent23e01242dfe21800d196e8d805735cd4a23f2f96 (diff)
downloadeclipse.platform.text-44d03aad38b002ebb13e47f0c67e74e2090ca598.tar.gz
eclipse.platform.text-44d03aad38b002ebb13e47f0c67e74e2090ca598.tar.xz
eclipse.platform.text-44d03aad38b002ebb13e47f0c67e74e2090ca598.zip
Fixed bug 499980 (part 2): Potential NPE below CompletionProposalPopup.computeProposals if no proposals possible
Diffstat (limited to 'org.eclipse.jface.text')
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java4
1 files changed, 2 insertions, 2 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 bfafd2278..5778315c5 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,9 +556,9 @@ class CompletionProposalPopup implements IContentAssistListener {
proposals= fContentAssistant.computeCompletionProposals(fContentAssistSubjectControl, offset);
} else {
proposals= fContentAssistant.computeCompletionProposals(fViewer, offset);
- if (proposals == null)
- return new ICompletionProposal[] {};
}
+ if (proposals == null)
+ return new ICompletionProposal[] {};
if (fSorter != null) {
sortProposals(proposals);
fIsInitialSort= true;

Back to the top