From d8970c51649104f9a33fa8655b4da6677f07c9b0 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 24 Jan 2017 17:16:01 +0300 Subject: [PATCH] convert atomic to LongAdder: check that variable type is valid EA-95170 --- .../intentions/ConvertAtomicToLongAdderIntention.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertAtomicToLongAdderIntention.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertAtomicToLongAdderIntention.java index 7b74a950c14f..0214807b1cfa 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertAtomicToLongAdderIntention.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/intentions/ConvertAtomicToLongAdderIntention.java @@ -58,7 +58,9 @@ public class ConvertAtomicToLongAdderIntention extends PsiElementBaseIntentionAc return null; } final PsiVariable var = (PsiVariable)element.getParent(); - final PsiClass aClass = PsiTypesUtil.getPsiClass(var.getType()); + final PsiType type = var.getType(); + if (!type.isValid()) return null; + final PsiClass aClass = PsiTypesUtil.getPsiClass(type); if (aClass == null || !(AtomicLong.class.getName().equals(aClass.getQualifiedName()) || AtomicInteger.class.getName().equals(aClass.getQualifiedName()))) {