mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Bug 511871 - CContentAssistProcessor.createContext may leak index lock

Browse source 
Change-Id: I828c94484c7b1594ba72551b80cd5ed6e6a8576c
This commit is contained in:
Sergey Prigogin 2017-02-07 14:48:32 -08:00
parent d06db08a30
commit c6955df2e2
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CContentAssistProcessor.java
View file

@ -266,6 +266,7 @@ public class CContentAssistProcessor extends ContentAssistProcessor {
char activationChar = getActivationChar(viewer, offset); char activationChar = getActivationChar(viewer, offset);
CContentAssistInvocationContext context = CContentAssistInvocationContext context =
new CContentAssistInvocationContext(viewer, offset, fEditor, isCompletion, isAutoActivated()); new CContentAssistInvocationContext(viewer, offset, fEditor, isCompletion, isAutoActivated());
try {
if (isCompletion && activationChar == '.' && fReplacementAutoActivationCharacters != null && if (isCompletion && activationChar == '.' && fReplacementAutoActivationCharacters != null &&
fReplacementAutoActivationCharacters.contains('.')) { fReplacementAutoActivationCharacters.contains('.')) {
IASTCompletionNode node = context.getCompletionNode(); IASTCompletionNode node = context.getCompletionNode();
@ -290,6 +291,11 @@ public class CContentAssistProcessor extends ContentAssistProcessor {
context = null; context = null;
} }
} }
} catch (RuntimeException | Error e) {
if (context != null)
context.dispose();
throw e;
}
return context; return context;
} }