opendev/gerrit
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Edwin Kempin
2014-09-12 15:26:22 +00:00
committed by Gerrit Code Review
parent 42d9d297d5 82d8358334
commit 89664c0c65
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/common/Version.java
View File

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