Code review fixes

2 files changed, 13 insertions, 7 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java b/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java
index c883e78d01d..1e64ac1618c 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/container/logging/ConnectionLogHandler.java
@@ -4,8 +4,11 @@ package com.yahoo.container.logging;
 
 import java.util.logging.Logger;
 
+/**
+ * @author mortent
+ */
 class ConnectionLogHandler {
-    public Logger connection = Logger.getAnonymousLogger();
+    public final Logger connection = Logger.getAnonymousLogger();
     private final LogFileHandler logFileHandler;
 
     public ConnectionLogHandler(String clusterName) {
@@ -23,8 +26,6 @@ class ConnectionLogHandler {
     public void shutdown() {
         logFileHandler.close();
         connection.removeHandler(logFileHandler);
-
-        if (logFileHandler!=null)
-            logFileHandler.shutdown();
+        logFileHandler.shutdown();
     }
 }
\ No newline at end of file
diff --git a/jdisc_http_service/src/main/java/com/yahoo/container/logging/FileConnectionLog.java b/jdisc_http_service/src/main/java/com/yahoo/container/logging/FileConnectionLog.java
index 79ea3395283..16e49730fdd 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/container/logging/FileConnectionLog.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/container/logging/FileConnectionLog.java
@@ -3,7 +3,7 @@
 package com.yahoo.container.logging;
 
 import com.google.inject.Inject;
-import com.yahoo.jdisc.http.container.logging.ConnectionLogConfig;
+import com.yahoo.component.AbstractComponent;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -11,7 +11,7 @@ import java.util.logging.Logger;
 /**
  * @author mortent
  */
-public class FileConnectionLog implements ConnectionLog {
+public class FileConnectionLog extends AbstractComponent implements ConnectionLog {
 
     private static final Logger logger = Logger.getLogger(FileConnectionLog.class.getName());
     private final ConnectionLogHandler logHandler;
@@ -29,4 +29,9 @@ public class FileConnectionLog implements ConnectionLog {
             logger.log(Level.WARNING, "Unable to write connection log entry for connection id " + connectionLogEntry.id(), e);
         }
     }
-}
+
+    @Override
+    public void deconstruct() {
+        logHandler.shutdown();
+    }
+}
\ No newline at end of file