diff options
Diffstat (limited to 'logserver/src')
-rw-r--r-- | logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java | 2 | ||||
-rw-r--r-- | logserver/src/main/java/com/yahoo/logserver/handlers/archive/FilesArchived.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java b/logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java index 4b586a148a7..21cc50f51c1 100644 --- a/logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java @@ -187,7 +187,7 @@ public class HandlerThread extends Thread implements LogHandler { // messages or lists of log messages, so we need to // handle them accordingly. ItemOrList o = drainList.get(i); - drainList.set(i, o); + drainList.set(i, null); if (o.item != null) { for (LogHandler handler : handlers) { diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/FilesArchived.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/FilesArchived.java index 520393c3896..68f83e2e638 100644 --- a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/FilesArchived.java +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/FilesArchived.java @@ -46,9 +46,7 @@ public class FilesArchived { private void run() { try { while (true) { - while (maintenance()) { - waitForTrigger(2000); - } + maintenance(); waitForTrigger(2000); } } catch (Exception e) { |