SONAR-2715 Provide meaningful exception message, when source file cannot be imported

2 files changed, 3 insertions, 5 deletions

diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/JavaSourceImporter.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/JavaSourceImporter.java
index e8c0cf381e3..2ee116ca0d7 100644
--- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/JavaSourceImporter.java
+++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/plugins/squid/JavaSourceImporter.java
@@ -30,7 +30,6 @@ import org.sonar.api.resources.*;
 import org.sonar.api.utils.SonarException;
 import org.sonar.java.api.JavaUtils;
 
-import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
 
@@ -84,7 +83,7 @@ public final class JavaSourceImporter implements Sensor {
         context.saveSource(javaFile, source);
       }
 
-    } catch (IOException e) {
+    } catch (Exception e) {
       throw new SonarException("Unable to read and import the source file : '" + inputFile.getFile().getAbsolutePath() + "' with the charset : '"
           + sourcesEncoding.name() + "'.", e);
     }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java
index ba667ea09d3..89ed88c9fe8 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java
@@ -25,7 +25,6 @@ import org.sonar.api.resources.*;
 import org.sonar.api.utils.SonarException;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
 
@@ -81,9 +80,9 @@ public abstract class AbstractSourceImporter implements Sensor {
             String source = FileUtils.readFileToString(file, sourcesEncoding.name());
             context.saveSource(resource, source);
           }
-        } catch (IOException e) {
+        } catch (Exception e) {
           throw new SonarException("Unable to read and import the source file : '" + file.getAbsolutePath() + "' with the charset : '"
-              + sourcesEncoding.name() + "'. You should check the property " + CoreProperties.ENCODING_PROPERTY, e);
+              + sourcesEncoding.name() + "'.", e);
         }
       }
     }