Merge pull request #554 from akkinoc/fix/96

Suppresses NullPointerException that occurs when the server name is missing
akkinoc · Jan 25, 2025 · 163e614 · 163e614
2 parents d5eb93c + b63c6c6
commit 163e614
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/main/kotlin/dev/akkinoc/spring/boot/logback/access/LogbackAccessEvent.kt b/src/main/kotlin/dev/akkinoc/spring/boot/logback/access/LogbackAccessEvent.kt
@@ -59,7 +59,7 @@ class LogbackAccessEvent(private var source: LogbackAccessEventSource) : IAccess
     }
 
     override fun getServerName(): String {
-        return source.serverName
+        return source.serverName ?: NA
     }
 
     override fun getLocalPort(): Int {

diff --git a/src/main/kotlin/dev/akkinoc/spring/boot/logback/access/LogbackAccessEventSource.kt b/src/main/kotlin/dev/akkinoc/spring/boot/logback/access/LogbackAccessEventSource.kt
@@ -53,7 +53,7 @@ abstract class LogbackAccessEventSource {
     /**
      * The value of [IAccessEvent.getServerName].
      */
-    abstract val serverName: String
+    abstract val serverName: String?
 
     /**
      * The value of [IAccessEvent.getLocalPort].
@@ -185,7 +185,7 @@ abstract class LogbackAccessEventSource {
 
         override val threadName: String = source.threadName
 
-        override val serverName: String = source.serverName
+        override val serverName: String? = source.serverName
 
         override val localPort: Int = source.localPort
 

diff --git a/...main/kotlin/dev/akkinoc/spring/boot/logback/access/jetty/LogbackAccessJettyEventSource.kt b/...main/kotlin/dev/akkinoc/spring/boot/logback/access/jetty/LogbackAccessJettyEventSource.kt
@@ -59,7 +59,7 @@ class LogbackAccessJettyEventSource(
 
     override val threadName: String = currentThread().name
 
-    override val serverName: String by lazy(LazyThreadSafetyMode.NONE) {
+    override val serverName: String? by lazy(LazyThreadSafetyMode.NONE) {
         Request.getServerName(rawRequest)
     }
 

diff --git a/...in/kotlin/dev/akkinoc/spring/boot/logback/access/tomcat/LogbackAccessTomcatEventSource.kt b/...in/kotlin/dev/akkinoc/spring/boot/logback/access/tomcat/LogbackAccessTomcatEventSource.kt
@@ -55,7 +55,7 @@ class LogbackAccessTomcatEventSource(
 
     override val threadName: String = currentThread().name
 
-    override val serverName: String by lazy(LazyThreadSafetyMode.NONE) {
+    override val serverName: String? by lazy(LazyThreadSafetyMode.NONE) {
         request.getAccessLogAttribute(SERVER_NAME_ATTRIBUTE) ?: request.serverName
     }
 

diff --git a/...otlin/dev/akkinoc/spring/boot/logback/access/undertow/LogbackAccessUndertowEventSource.kt b/...otlin/dev/akkinoc/spring/boot/logback/access/undertow/LogbackAccessUndertowEventSource.kt
@@ -66,7 +66,7 @@ class LogbackAccessUndertowEventSource(
 
     override val threadName: String = currentThread().name
 
-    override val serverName: String by lazy(LazyThreadSafetyMode.NONE) {
+    override val serverName: String? by lazy(LazyThreadSafetyMode.NONE) {
         exchange.hostName
     }