From bc68193db9f3d28493483df7b1f210853045548d Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Wed, 27 Mar 2019 11:17:19 +0100 Subject: Resolve conflicting definition of sentinel value for missing thread id --- vespalog/src/main/java/com/yahoo/log/LogMessage.java | 4 ++-- vespalog/src/main/java/com/yahoo/log/VespaFormat.java | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'vespalog/src') diff --git a/vespalog/src/main/java/com/yahoo/log/LogMessage.java b/vespalog/src/main/java/com/yahoo/log/LogMessage.java index d861557da50..0eb446ec288 100644 --- a/vespalog/src/main/java/com/yahoo/log/LogMessage.java +++ b/vespalog/src/main/java/com/yahoo/log/LogMessage.java @@ -81,7 +81,7 @@ public class LogMessage public long getTimeInSeconds () {return time.getEpochSecond();} public String getHost () {return host;} public long getProcessId() {return processId;} - public OptionalLong getThreadId() {return threadId != -1 ? OptionalLong.of(threadId) : OptionalLong.empty();} + public OptionalLong getThreadId() {return threadId > 0 ? OptionalLong.of(threadId) : OptionalLong.empty();} /** * @deprecated Use {@link #getProcessId()} / {@link #getThreadId()} */ @@ -137,7 +137,7 @@ public class LogMessage private static long parseThreadId(String threadProcess) { int slashIndex = threadProcess.indexOf('/'); if (slashIndex == -1) { - return -1; + return 0; } return Long.parseLong(threadProcess.substring(slashIndex + 1)); } diff --git a/vespalog/src/main/java/com/yahoo/log/VespaFormat.java b/vespalog/src/main/java/com/yahoo/log/VespaFormat.java index 622dcc6f42d..3d1a2ae0dc8 100644 --- a/vespalog/src/main/java/com/yahoo/log/VespaFormat.java +++ b/vespalog/src/main/java/com/yahoo/log/VespaFormat.java @@ -201,9 +201,6 @@ public class VespaFormat { } static String formatThreadProcess(long processId, long threadId) { - if (processId == 0) { - return ""; - } if (threadId == 0) { return Long.toString(processId); } -- cgit v1.2.3