Merge "Don't show "null" for version in daemon console log"

This commit is contained in:
Edwin Kempin
2014-09-12 15:26:22 +00:00
committed by Gerrit Code Review

View File

@@ -37,7 +37,7 @@ public class Version {
private static String loadVersion() {
try (InputStream in = Version.class.getResourceAsStream("Version")) {
if (in == null) {
return null;
return "(dev)";
}
try (BufferedReader r = new BufferedReader(new InputStreamReader(in, "UTF-8"))) {
String vs = r.readLine();
@@ -51,7 +51,7 @@ public class Version {
}
} catch (IOException e) {
log.error(e.getMessage(), e);
return null;
return "(unknown version)";
}
}