diff options
| -rw-r--r-- | server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java | 2 | ||||
| -rw-r--r-- | sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java index 6d6adce0883..3bef26f2922 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java +++ b/server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java @@ -227,9 +227,11 @@ public class BulkIndexer implements Startable { } void beforeStart(BulkIndexer bulkIndexer) { + // nothing to do, to be overridden if needed } void afterStop(BulkIndexer bulkIndexer) { + // nothing to do, to be overridden if needed } } diff --git a/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java b/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java index ae746c6580b..75e135919ee 100644 --- a/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java +++ b/sonar-core/src/main/java/org/sonar/core/i18n/DefaultI18n.java @@ -210,8 +210,8 @@ public class DefaultI18n implements I18n, Startable { return result; } - String readInputStream(String filePath, InputStream input) { - String result = null; + private String readInputStream(String filePath, InputStream input) { + String result; try { result = IOUtils.toString(input, "UTF-8"); } catch (IOException e) { |