diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java index ea03ce2f6ac6..1894e7d0a917 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ErrorRethrownInspection.java @@ -36,13 +36,7 @@ public class ErrorRethrownInspection extends StatementInspection { public void visitTryStatement(PsiTryStatement statement) { super.visitTryStatement(statement); final PsiParameter[] parameters = statement.getCatchBlockParameters(); - if (parameters == null) { - return; - } final PsiCodeBlock[] catchBlocks = statement.getCatchBlocks(); - if (catchBlocks == null) { - return; - } final int length = Math.min(parameters.length, catchBlocks.length); for (int i = 0; i < length; i++) { final PsiParameter parameter = parameters[i]; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java index 2c0b882eec57..6f08138c46de 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java @@ -35,12 +35,6 @@ public class ThreadDeathRethrownInspection extends StatementInspection { super.visitTryStatement(statement); final PsiParameter[] parameters = statement.getCatchBlockParameters(); final PsiCodeBlock[] catchBlocks = statement.getCatchBlocks(); - if (parameters == null) { - return; - } - if (catchBlocks == null) { - return; - } final int length = Math.min(parameters.length, catchBlocks.length); for (int i = 0; i < length; i++) { final PsiParameter parameter = parameters[i]; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnusedCatchParameterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnusedCatchParameterInspection.java index b99a36df67a4..5b258c0dfec0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnusedCatchParameterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/UnusedCatchParameterInspection.java @@ -81,7 +81,7 @@ public class UnusedCatchParameterInspection extends StatementInspection { final PsiCodeBlock[] catchBlocks = statement.getCatchBlocks(); final PsiParameter[] params = statement.getCatchBlockParameters(); - for (int i = 0; i < Math.min(catchBlocks.length, params.length); i++) { + for (int i = 0; i < catchBlocks.length; i++) { final PsiCodeBlock block = catchBlocks[i]; final PsiParameter param = params[i]; if (m_ignoreCatchBlocksWithComments) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryFinalOnLocalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryFinalOnLocalVariableInspection.java index ed4c03d984b0..a3f10e17e943 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryFinalOnLocalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/verbose/UnnecessaryFinalOnLocalVariableInspection.java @@ -73,8 +73,7 @@ public class UnnecessaryFinalOnLocalVariableInspection extends MethodInspection final PsiParameter[] catchBlockParameters = statement.getCatchBlockParameters(); final PsiCodeBlock[] catchBlocks = statement.getCatchBlocks(); - final int numBlocks = Math.min(catchBlocks.length, catchBlockParameters.length); - for (int i = 0; i < numBlocks; i++) { + for (int i = 0; i < catchBlocks.length; i++) { final PsiCodeBlock catchBlock = catchBlocks[i]; final PsiParameter parameter = catchBlockParameters[i]; if (parameter.hasModifierProperty(PsiModifier.FINAL) &&