diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java')
| -rw-r--r-- | java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java b/java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java index 6c611f707d6c..ff1f366c42e5 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java @@ -294,7 +294,10 @@ public class RedundantThrows extends GlobalJavaBatchInspectionTool { if (refMethod != null) { for (RefMethod refDerived : refMethod.getDerivedMethods()) { - removeException(refDerived, exceptionType, refsToDelete, (PsiMethod)refDerived.getElement()); + PsiModifierListOwner method = refDerived.getElement(); + if (method != null) { + removeException(refDerived, exceptionType, refsToDelete, (PsiMethod)method); + } } } else { final Query<Pair<PsiMethod,PsiMethod>> query = AllOverridingMethodsSearch.search(psiMethod.getContainingClass()); |