More lazy debug log message generation

3 files changed, 5 insertions, 5 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 65dc1052a78..ba9f1804d34 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -190,7 +190,7 @@ public class SearchHandler extends LoggingRequestHandler {
                          long numQueriesToTraceOnDebugAfterStartup,
                          Optional<String> hostResponseHeaderKey) {
         super(executor, metric, true);
-        log.log(Level.FINE, "SearchHandler.init " + System.identityHashCode(this));
+        log.log(Level.FINE, () -> "SearchHandler.init " + System.identityHashCode(this));
         this.queryProfileRegistry = queryProfileRegistry;
         this.executionFactory = executionFactory;
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java b/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java
index d66aff7bcd7..af73e905f20 100644
--- a/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java
+++ b/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterUtils.java
@@ -289,7 +289,7 @@ public class RewriterUtils {
      * @param msg Log message
      */
     public static void log(Logger logger, String msg) {
-        logger.log(Level.FINE, logger.getName() + ": " + msg);
+        logger.log(Level.FINE, () -> logger.getName() + ": " + msg);
     }
 
     /**
@@ -303,7 +303,7 @@ public class RewriterUtils {
         if(query!=null) {
             query.trace(logger.getName() + ": " + msg, true, TRACELEVEL);
         }
-        logger.log(Level.FINE, logger.getName() + ": " + msg);
+        logger.log(Level.FINE, () -> logger.getName() + ": " + msg);
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
index ef0a60c76c0..7d7b78f7153 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsVisitor.java
@@ -331,8 +331,8 @@ class VdsVisitor extends VisitorDataHandler implements Visitor {
     public void doSearch() throws InterruptedException, ParseException, TimeoutException {
         VisitorSession session = visitorSessionFactory.createVisitorSession(params);
         try {
-            if ( !session.waitUntilDone(query.getTimeout())) {
-                log.log(Level.FINE, "Visitor returned from waitUntilDone without being completed for " + query + " with selection " + params.getDocumentSelection());
+            if ( ! session.waitUntilDone(query.getTimeout())) {
+                log.log(Level.FINE, () -> "Visitor returned from waitUntilDone without being completed for " + query + " with selection " + params.getDocumentSelection());
                 session.abort();
                 throw new TimeoutException("Query timed out in " + VdsStreamingSearcher.class.getName());
             }