From f8e4d6fb216f70beaa67a3f34c7f94232bfce9d7 Mon Sep 17 00:00:00 2001 From: Dmitry Cheryasov Date: Tue, 13 Jul 2010 15:46:09 +0300 Subject: [PATCH] Fix edge case NPEs. --- .../python/inspections/PyPropertyDefinitionInspection.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python/src/com/jetbrains/python/inspections/PyPropertyDefinitionInspection.java b/python/src/com/jetbrains/python/inspections/PyPropertyDefinitionInspection.java index a377fa9a6950..dc55e0af0bac 100644 --- a/python/src/com/jetbrains/python/inspections/PyPropertyDefinitionInspection.java +++ b/python/src/com/jetbrains/python/inspections/PyPropertyDefinitionInspection.java @@ -222,7 +222,8 @@ public class PyPropertyDefinitionInspection extends PyInspection { if (callable != null) { // signature: at least two params, more optionals ok; first arg 'self' final PyParameterList param_list = callable.getParameterList(); - if (myTwoParamList != null && ! param_list.isCompatibleTo(myTwoParamList.get())) { + final PyParameterList two_parameters_list = myTwoParamList.get(); + if (two_parameters_list != null && !param_list.isCompatibleTo(two_parameters_list)) { registerProblem(being_checked, PyBundle.message("INSP.setter.signature.advice")); } checkForSelf(param_list); @@ -240,7 +241,8 @@ public class PyPropertyDefinitionInspection extends PyInspection { private void checkOneParameter(Callable callable, PsiElement being_checked, boolean is_getter) { final PyParameterList param_list = callable.getParameterList(); - if (myOneParamList != null && ! param_list.isCompatibleTo(myOneParamList.get())) { + final PyParameterList one_parameter_list = myOneParamList.get(); + if (one_parameter_list != null && ! param_list.isCompatibleTo(one_parameter_list)) { if (is_getter) registerProblem(being_checked, PyBundle.message("INSP.getter.signature.advice")); else registerProblem(being_checked, PyBundle.message("INSP.deleter.signature.advice")); }