From 6fa0bfb71c136f6220c4535aebb11a81d1d28629 Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Mon, 15 Feb 2010 16:52:06 +0300
Subject: [PATCH] NPE (18686)

---
 .../intellij/refactoring/rename/inplace/VariableInplaceRenamer.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
index 8b5f4db088..30945e6ab6 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/VariableInplaceRenamer.java
@@ -263,7 +263,10 @@ public class VariableInplaceRenamer {
           for (final PsiNamedElement element : renamer.getElements()) {
             ApplicationManager.getApplication().runWriteAction(new Runnable() {
               public void run() {
-                RenameUtil.doRenameGenericNamedElement(element, renamer.getRenames().get(element), RenameProcessor.extractUsagesForElement(element, usageInfos), null);
+                final String newElementName = renamer.getNewName(element);
+                if (newElementName != null) {
+                  RenameUtil.doRenameGenericNamedElement(element, newElementName, RenameProcessor.extractUsagesForElement(element, usageInfos), null);
+                }
               }
             });
           }
-- 
2.11.4.GIT