You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/02/27 16:00:04 UTC
svn commit: r1662692 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractHttp11Protocol.java upgrade/UpgradeProcessor.java
upgrade/UpgradeProcessorBase.java upgrade/UpgradeProcessorExternal.java
Author: markt
Date: Fri Feb 27 15:00:04 2015
New Revision: 1662692
URL: http://svn.apache.org/r1662692
Log:
Start moving towards separate internal (uses I/O layer directly) and
external (uses Servlet[Input|Output]Stream]) implementations of
UpgradeProcessor
Added:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java (with props)
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java (contents, props changed)
- copied, changed from r1662614, tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Removed:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1662692&r1=1662691&r2=1662692&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Fri Feb 27 15:00:04 2015
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpUpgradeHan
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.Processor;
-import org.apache.coyote.http11.upgrade.UpgradeProcessor;
+import org.apache.coyote.http11.upgrade.UpgradeProcessorExternal;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.SocketWrapperBase;
@@ -283,7 +283,7 @@ public abstract class AbstractHttp11Prot
SocketWrapperBase<?> socket, ByteBuffer leftoverInput,
HttpUpgradeHandler httpUpgradeHandler)
throws IOException {
- return new UpgradeProcessor(socket, leftoverInput, httpUpgradeHandler);
+ return new UpgradeProcessorExternal(socket, leftoverInput, httpUpgradeHandler);
}
}
}
Added: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java?rev=1662692&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java (added)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java Fri Feb 27 15:00:04 2015
@@ -0,0 +1,22 @@
+/*
+ * 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.coyote.http11.upgrade;
+
+import org.apache.coyote.Processor;
+
+public abstract class UpgradeProcessorBase implements Processor {
+}
Propchange: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java (from r1662614, tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java&r1=1662614&r2=1662692&rev=1662692&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java Fri Feb 27 15:00:04 2015
@@ -25,7 +25,6 @@ import javax.servlet.ServletOutputStream
import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.WebConnection;
-import org.apache.coyote.Processor;
import org.apache.coyote.Request;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -35,19 +34,19 @@ import org.apache.tomcat.util.net.Socket
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
-public class UpgradeProcessor implements Processor, WebConnection {
+public class UpgradeProcessorExternal extends UpgradeProcessorBase implements WebConnection {
private static final int INFINITE_TIMEOUT = -1;
- private static final Log log = LogFactory.getLog(UpgradeProcessor.class);
- private static final StringManager sm = StringManager.getManager(UpgradeProcessor.class);
+ private static final Log log = LogFactory.getLog(UpgradeProcessorExternal.class);
+ private static final StringManager sm = StringManager.getManager(UpgradeProcessorExternal.class);
private final HttpUpgradeHandler httpUpgradeHandler;
private final UpgradeServletInputStream upgradeServletInputStream;
private final UpgradeServletOutputStream upgradeServletOutputStream;
- public UpgradeProcessor(SocketWrapperBase<?> wrapper, ByteBuffer leftOverInput,
+ public UpgradeProcessorExternal(SocketWrapperBase<?> wrapper, ByteBuffer leftOverInput,
HttpUpgradeHandler httpUpgradeHandler) {
this.httpUpgradeHandler = httpUpgradeHandler;
this.upgradeServletInputStream = new UpgradeServletInputStream(wrapper);
Propchange: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org