diff options
author | Dawid Pakuła | 2018-05-27 11:18:42 +0000 |
---|---|---|
committer | Dawid Pakuła | 2018-05-27 11:18:42 +0000 |
commit | 99347f38d99618b7999146fc0deec0de2f5dd632 (patch) | |
tree | c53e8de67111ff7d03bcb8771f164d9784f62dbb /org.eclipse.jface.text | |
parent | 1e43b3ba58740f78bbd54f9894dec1d7821c8ac3 (diff) | |
download | eclipse.platform.text-99347f38d99618b7999146fc0deec0de2f5dd632.tar.gz eclipse.platform.text-99347f38d99618b7999146fc0deec0de2f5dd632.tar.xz eclipse.platform.text-99347f38d99618b7999146fc0deec0de2f5dd632.zip |
Bug 535162 - [content assist] Possible NPE during async computeFilteredProposals
Change-Id: I7a323704706b10d8dde1e3e0fc75e1293d337e92
Signed-off-by: Dawid Pakuła <zulus@w3des.net>
Diffstat (limited to 'org.eclipse.jface.text')
-rw-r--r-- | org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java index 26f260d4ac4..4178c78acd7 100644 --- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java +++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AsyncCompletionProposalPopup.java @@ -304,7 +304,7 @@ class AsyncCompletionProposalPopup extends CompletionProposalPopup { @Override protected List<ICompletionProposal> computeFilteredProposals(int offset, DocumentEvent event) { - if(fComputedProposals.size() > 0 && fComputedProposals.get(0) instanceof ComputingProposal) { + if(fComputedProposals != null && fComputedProposals.size() > 0 && fComputedProposals.get(0) instanceof ComputingProposal) { Set<CompletableFuture<List<ICompletionProposal>>> remaining = Collections.synchronizedSet(new HashSet<>(fFutures)); for (CompletableFuture<List<ICompletionProposal>> future : fFutures) { future.thenRun(() -> { |