summaryrefslogtreecommitdiffstats
path: root/vespalog
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-03-27 11:17:19 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2019-03-27 11:21:47 +0100
commitbc68193db9f3d28493483df7b1f210853045548d (patch)
tree2b2a211e78c0c91928d9ddd890e268c292e706e0 /vespalog
parent74d759c33f7523c5972f2499c27daef6f073ba7b (diff)
Resolve conflicting definition of sentinel value for missing thread id
Diffstat (limited to 'vespalog')
-rw-r--r--vespalog/src/main/java/com/yahoo/log/LogMessage.java4
-rw-r--r--vespalog/src/main/java/com/yahoo/log/VespaFormat.java3
2 files changed, 2 insertions, 5 deletions
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);
}