svn commit: r1854315 - in /felix/trunk/http/jetty: pom.xml src/main/java/org/apache/felix/http/jetty/internal/FileRequestLog.java src/main/java/org/apache/felix/http/jetty/internal/LogServiceRequestLog.java

[cziegeler]

Author: cziegeler
Date: Mon Feb 25 15:05:03 2019
New Revision: 1854315

URL: http://svn.apache.org/viewvc?rev=1854315&view=rev
Log:
FELIX-6068 : Update Jetty to 9.4.15.v20190215

Modified:
    felix/trunk/http/jetty/pom.xml
    
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/FileRequestLog.java
    
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LogServiceRequestLog.java

Modified: felix/trunk/http/jetty/pom.xml
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/jetty/pom.xml?rev=1854315&r1=1854314&r2=1854315&view=diff
==============================================================================
--- felix/trunk/http/jetty/pom.xml (original)
+++ felix/trunk/http/jetty/pom.xml Mon Feb 25 15:05:03 2019
@@ -43,7 +43,7 @@
         <!-- Skip because of problems with Java 8 -->
         <animal.sniffer.skip>true</animal.sniffer.skip>
         <felix.java.version>8</felix.java.version>
-        <jetty.version>9.4.12.v20180830</jetty.version>
+        <jetty.version>9.4.15.v20190215</jetty.version>
     </properties>
 
     <build>

Modified: 
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/FileRequestLog.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/FileRequestLog.java?rev=1854315&r1=1854314&r2=1854315&view=diff
==============================================================================
--- 
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/FileRequestLog.java
 (original)
+++ 
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/FileRequestLog.java
 Mon Feb 25 15:05:03 2019
@@ -45,7 +45,7 @@ class FileRequestLog {
         logFilePath = config.getRequestLogFilePath();
         serviceName = config.getRequestLogFileServiceName() != null ? 
config.getRequestLogFileServiceName() : DEFAULT_NAME;
         if (config.isRequestLogFileAsync()) {
-            delegate = new AsyncNCSARequestLog(logFilePath);
+            delegate = new AsyncNCSARequestLog(logFilePath, null);
         } else {
             delegate = new NCSARequestLog(logFilePath);
         }
@@ -87,7 +87,7 @@ class FileRequestLog {
             if (registration != null) {
                 registration.unregister();
             }
-            delegate.stop();;
+            delegate.stop();
         } catch (Exception e) {
             SystemLogger.error("Error shutting down File Request Log", e);
         } finally {

Modified: 
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LogServiceRequestLog.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LogServiceRequestLog.java?rev=1854315&r1=1854314&r2=1854315&view=diff
==============================================================================
--- 
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LogServiceRequestLog.java
 (original)
+++ 
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/LogServiceRequestLog.java
 Mon Feb 25 15:05:03 2019
@@ -23,6 +23,7 @@ import java.util.Hashtable;
 import org.apache.felix.http.base.internal.logger.SystemLogger;
 import org.eclipse.jetty.server.AbstractNCSARequestLog;
 import org.eclipse.jetty.server.RequestLog;
+import org.eclipse.jetty.server.RequestLogWriter;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
@@ -40,6 +41,7 @@ class LogServiceRequestLog extends Abstr
     private ServiceRegistration<RequestLog> registration;
 
     LogServiceRequestLog(JettyConfig config) {
+        super(new RequestLogWriter());
         this.serviceName = config.getRequestLogOSGiServiceName();
     }
 
@@ -55,7 +57,7 @@ class LogServiceRequestLog extends Abstr
     public synchronized void unregister() {
         try {
             if (registration != null) {
-                registration.unregister();;
+                registration.unregister();
             }
         } finally {
             registration = null;