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:10 UTC
svn commit: r1662693 - in /tomcat/trunk/java/org/apache:
coyote/http11/upgrade/ tomcat/websocket/server/
Author: markt
Date: Fri Feb 27 15:00:10 2015
New Revision: 1662693
URL: http://svn.apache.org/r1662693
Log:
Add an InternalHttpUpgradeHandler. Not currently used.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java?rev=1662693&r1=1662692&r2=1662693&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/InternalHttpUpgradeHandler.java Fri Feb 27 15:00:10 2015
@@ -18,6 +18,9 @@ package org.apache.coyote.http11.upgrade
import javax.servlet.http.HttpUpgradeHandler;
+import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
+import org.apache.tomcat.util.net.SocketStatus;
+
/**
* Currently just a marker interface to enable Tomcat to identify
@@ -29,4 +32,6 @@ import javax.servlet.http.HttpUpgradeHan
* Servlet API.
*/
public interface InternalHttpUpgradeHandler extends HttpUpgradeHandler {
+
+ SocketState upgradeDispatch(SocketStatus status);
}
\ No newline at end of file
Modified: 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=1662693&r1=1662692&r2=1662693&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java Fri Feb 27 15:00:10 2015
@@ -16,7 +16,104 @@
*/
package org.apache.coyote.http11.upgrade;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.concurrent.Executor;
+
+import javax.servlet.http.HttpUpgradeHandler;
+
import org.apache.coyote.Processor;
+import org.apache.coyote.Request;
+import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
+import org.apache.tomcat.util.net.SSLSupport;
+import org.apache.tomcat.util.net.SocketStatus;
+import org.apache.tomcat.util.net.SocketWrapperBase;
public abstract class UpgradeProcessorBase implements Processor {
+
+ public UpgradeProcessorBase(SocketWrapperBase<?> wrapper, ByteBuffer leftOverInput) {
+ wrapper.unRead(leftOverInput);
+ }
+
+
+ // ------------------------------------------- Implemented Processor methods
+
+ @Override
+ public final boolean isUpgrade() {
+ return true;
+ }
+
+
+ @Override
+ public final void recycle() {
+ // Currently a NO-OP as upgrade processors are not recycled.
+ }
+
+
+ // ---------------------------- Processor methods that are NO-OP for upgrade
+
+ @Override
+ public HttpUpgradeHandler getHttpUpgradeHandler() {
+ return null;
+ }
+
+
+ @Override
+ public final Executor getExecutor() {
+ return null;
+ }
+
+
+ @Override
+ public final SocketState process(SocketWrapperBase<?> socketWrapper) throws IOException {
+ return null;
+ }
+
+
+ @Override
+ public final SocketState asyncDispatch(SocketStatus status) {
+ return null;
+ }
+
+
+ @Override
+ public void errorDispatch() {
+ // NO-OP
+ }
+
+
+ @Override
+ public final SocketState asyncPostProcess() {
+ return null;
+ }
+
+
+ @Override
+ public final boolean isAsync() {
+ return false;
+ }
+
+
+ @Override
+ public final Request getRequest() {
+ return null;
+ }
+
+
+ @Override
+ public String getClientCertProvider() {
+ return null;
+ }
+
+
+ @Override
+ public final void setSslSupport(SSLSupport sslSupport) {
+ // NOOP
+ }
+
+
+ @Override
+ public ByteBuffer getLeftoverInput() {
+ return null;
+ }
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java?rev=1662693&r1=1662692&r2=1662693&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java Fri Feb 27 15:00:10 2015
@@ -18,18 +18,15 @@ package org.apache.coyote.http11.upgrade
import java.io.IOException;
import java.nio.ByteBuffer;
-import java.util.concurrent.Executor;
import javax.servlet.ServletInputStream;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpUpgradeHandler;
import javax.servlet.http.WebConnection;
-import org.apache.coyote.Request;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
-import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.net.SocketWrapperBase;
import org.apache.tomcat.util.res.StringManager;
@@ -41,14 +38,13 @@ public class UpgradeProcessorExternal ex
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 UpgradeProcessorExternal(SocketWrapperBase<?> wrapper, ByteBuffer leftOverInput,
HttpUpgradeHandler httpUpgradeHandler) {
- this.httpUpgradeHandler = httpUpgradeHandler;
+ super(wrapper, leftOverInput);
this.upgradeServletInputStream = new UpgradeServletInputStream(wrapper);
this.upgradeServletOutputStream = new UpgradeServletOutputStream(wrapper);
@@ -90,18 +86,6 @@ public class UpgradeProcessorExternal ex
// ------------------------------------------- Implemented Processor methods
@Override
- public final boolean isUpgrade() {
- return true;
- }
-
-
- @Override
- public HttpUpgradeHandler getHttpUpgradeHandler() {
- return httpUpgradeHandler;
- }
-
-
- @Override
public final SocketState upgradeDispatch(SocketStatus status) {
if (status == SocketStatus.OPEN_READ) {
upgradeServletInputStream.onDataAvailable();
@@ -140,72 +124,4 @@ public class UpgradeProcessorExternal ex
}
return SocketState.UPGRADED;
}
-
-
- @Override
- public final void recycle() {
- // Currently a NO-OP as upgrade processors are not recycled.
- }
-
-
- // ---------------------------- Processor methods that are NO-OP for upgrade
-
- @Override
- public final Executor getExecutor() {
- return null;
- }
-
-
- @Override
- public final SocketState process(SocketWrapperBase<?> socketWrapper) throws IOException {
- return null;
- }
-
-
- @Override
- public final SocketState asyncDispatch(SocketStatus status) {
- return null;
- }
-
-
- @Override
- public void errorDispatch() {
- // NO-OP
- }
-
-
- @Override
- public final SocketState asyncPostProcess() {
- return null;
- }
-
-
- @Override
- public final boolean isAsync() {
- return false;
- }
-
-
- @Override
- public final Request getRequest() {
- return null;
- }
-
-
- @Override
- public String getClientCertProvider() {
- return null;
- }
-
-
- @Override
- public final void setSslSupport(SSLSupport sslSupport) {
- // NOOP
- }
-
-
- @Override
- public ByteBuffer getLeftoverInput() {
- return null;
- }
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java?rev=1662693&r1=1662692&r2=1662693&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java Fri Feb 27 15:00:10 2015
@@ -37,6 +37,8 @@ import javax.websocket.Extension;
import org.apache.coyote.http11.upgrade.InternalHttpUpgradeHandler;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
+import org.apache.tomcat.util.net.SocketStatus;
import org.apache.tomcat.util.res.StringManager;
import org.apache.tomcat.websocket.Transformation;
import org.apache.tomcat.websocket.WsIOException;
@@ -150,6 +152,13 @@ public class WsHttpUpgradeHandler implem
}
+ @Override
+ public SocketState upgradeDispatch(SocketStatus status) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
@Override
public void destroy() {
if (connection != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org