From 4fc7a31a7f5130526678333f0dacec322280f008 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Thu, 17 Nov 2016 14:09:01 +0100
Subject: [PATCH] rename: simplify error processing

---
 .../com/intellij/refactoring/rename/RenameProcessor.java   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
index 63c3065f4b74..5869fead47d0 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameProcessor.java
@@ -201,7 +201,6 @@ public class RenameProcessor extends BaseRefactoringProcessor {
     }
 
     final int[] choice = myAllRenames.size() > 1 ? new int[]{-1} : null;
-    String message = null;
     try {
       for (Iterator<Map.Entry<PsiElement, String>> iterator = myAllRenames.entrySet().iterator(); iterator.hasNext(); ) {
         Map.Entry<PsiElement, String> entry = iterator.next();
@@ -217,11 +216,7 @@ public class RenameProcessor extends BaseRefactoringProcessor {
       }
     }
     catch (IncorrectOperationException e) {
-      message = e.getMessage();
-    }
-
-    if (message != null) {
-      CommonRefactoringUtil.showErrorMessage(RefactoringBundle.message("rename.title"), message, getHelpID(), myProject);
+      CommonRefactoringUtil.showErrorMessage(RefactoringBundle.message("rename.title"), e.getMessage(), getHelpID(), myProject);
       return false;
     }
 
-- 
2.32.0