1 files changed, 3 insertions, 2 deletions
diff --git a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
index 9beae9463c0..9139cf8fb07 100644
--- a/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
+++ b/container-accesslogging/src/main/java/com/yahoo/container/logging/AccessLogEntry.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 
@@ -769,9 +770,9 @@ public class AccessLogEntry {
         }
     }
 
-    public String getRawQuery() {
+    public Optional<String> getRawQuery() {
         synchronized (monitor) {
-            return rawQuery;
+            return Optional.ofNullable(rawQuery);
         }
     }