diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /java/java-impl/src/com/intellij/slicer/SliceNullnessAnalyzer.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'java/java-impl/src/com/intellij/slicer/SliceNullnessAnalyzer.java')
| -rw-r--r-- | java/java-impl/src/com/intellij/slicer/SliceNullnessAnalyzer.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/java-impl/src/com/intellij/slicer/SliceNullnessAnalyzer.java b/java/java-impl/src/com/intellij/slicer/SliceNullnessAnalyzer.java index c75c30dfb470..b65932aeaa81 100644 --- a/java/java-impl/src/com/intellij/slicer/SliceNullnessAnalyzer.java +++ b/java/java-impl/src/com/intellij/slicer/SliceNullnessAnalyzer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -178,8 +178,13 @@ public class SliceNullnessAnalyzer { node(element, map).add(node(duplicate, map)); } else { - SliceUsage sliceUsage = element.getValue(); - final PsiElement value = sliceUsage.getElement(); + final SliceUsage sliceUsage = element.getValue(); + final PsiElement value = ApplicationManager.getApplication().runReadAction(new Computable<PsiElement>() { + @Override + public PsiElement compute() { + return sliceUsage.getElement(); + } + }); Nullness nullness = ApplicationManager.getApplication().runReadAction(new Computable<Nullness>() { @Override public Nullness compute() { |