Author: markt
Date: Fri Jan 23 19:02:27 2015
New Revision: 1654315
URL: http://svn.apache.org/r1654315
Log:
Add a SendfileBase class and refactor the existing implementations to
inherit from it.
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java (with
props)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1654315&r1=1654314&r2=1654315&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri Jan 23
19:02:27 2015
@@ -1917,7 +1917,7 @@ public class AprEndpoint extends Abstrac
/**
* SendfileData class.
*/
- public static class SendfileData {
+ public static class SendfileData extends SendfileDataBase {
// File
public String fileName;
public long fd;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1654315&r1=1654314&r2=1654315&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Fri Jan 23
19:02:27 2015
@@ -1615,7 +1615,7 @@ public class Nio2Endpoint extends Abstra
/**
* SendfileData class.
*/
- public static class SendfileData {
+ public static class SendfileData extends SendfileDataBase {
// File
public String fileName;
public FileChannel fchannel;
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1654315&r1=1654314&r2=1654315&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri Jan 23
19:02:27 2015
@@ -1755,7 +1755,7 @@ public class NioEndpoint extends Abstrac
/**
* SendfileData class.
*/
- public static class SendfileData {
+ public static class SendfileData extends SendfileDataBase {
// File
public volatile String fileName;
public volatile FileChannel fchannel;
Added: tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java?rev=1654315&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java (added)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java Fri Jan
23 19:02:27 2015
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.util.net;
+
+public abstract class SendfileDataBase {
+
+}
Propchange: tomcat/trunk/java/org/apache/tomcat/util/net/SendfileDataBase.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
