From 46a4ea1c5aa33a0e9d4e37299360c3c083f2f49f Mon Sep 17 00:00:00 2001
From: Alexander Doroshko <alexander.doroshko@jetbrains.com>
Date: Thu, 28 Jun 2012 21:20:50 +0400
Subject: [PATCH] do not crash if IllegalCharsetNameException happens because
 of <encoding>${undeclared.property}</encoding>

---
 .../jetbrains/idea/maven/importing/MavenModuleImporter.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
index 207c5ed05f66..22021c2d70bc 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
@@ -34,6 +34,7 @@ import org.jetbrains.idea.maven.project.*;
 import org.jetbrains.idea.maven.utils.MavenUtil;
 
 import java.nio.charset.Charset;
+import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 import java.util.List;
 import java.util.Map;
@@ -233,9 +234,8 @@ public class MavenModuleImporter {
       try {
         EncodingManager.getInstance().setEncoding(myMavenProject.getDirectoryFile(), Charset.forName(encoding));
       }
-      catch (UnsupportedCharsetException ignored) {
-
-      }
+      catch (UnsupportedCharsetException ignored) {/**/}
+      catch (IllegalCharsetNameException ignored) {/**/}
     }
   }