tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1637932 - in /tomcat/trunk/java/org/apache/coyote/http11/upgrade: AbstractProcessor.java AprProcessor.java Nio2Processor.java NioProcessor.java ServletInputStreamImpl.java UpgradeServletInputStream.java
Date Mon, 10 Nov 2014 16:47:08 GMT
Author: markt
Date: Mon Nov 10 16:47:08 2014
New Revision: 1637932

URL: http://svn.apache.org/r1637932
Log:
Rename. Might collapse some of these packages at a later point.

Added:
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java   (contents,
props changed)
      - copied, changed from r1637931, tomcat/trunk/java/org/apache/coyote/http11/upgrade/ServletInputStreamImpl.java
Removed:
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/ServletInputStreamImpl.java
Modified:
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java
    tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java?rev=1637932&r1=1637931&r2=1637932&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java Mon Nov 10 16:47:08
2014
@@ -42,11 +42,11 @@ public abstract class AbstractProcessor<
     protected abstract Log getLog();
 
     private final HttpUpgradeHandler httpUpgradeHandler;
-    private final ServletInputStreamImpl upgradeServletInputStream;
+    private final UpgradeServletInputStream upgradeServletInputStream;
     private final AbstractServletOutputStream<S> upgradeServletOutputStream;
 
     protected AbstractProcessor (HttpUpgradeHandler httpUpgradeHandler,
-            ServletInputStreamImpl upgradeServletInputStream,
+            UpgradeServletInputStream upgradeServletInputStream,
             AbstractServletOutputStream<S> upgradeServletOutputStream) {
         this.httpUpgradeHandler = httpUpgradeHandler;
         this.upgradeServletInputStream = upgradeServletInputStream;

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java?rev=1637932&r1=1637931&r2=1637932&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java Mon Nov 10 16:47:08
2014
@@ -37,7 +37,7 @@ public class AprProcessor extends Abstra
     public AprProcessor(SocketWrapperBase<Long> wrapper, ByteBuffer leftOverInput,
             HttpUpgradeHandler httpUpgradeProcessor, int asyncWriteBufferSize) {
         super(httpUpgradeProcessor,
-                new ServletInputStreamImpl(wrapper),
+                new UpgradeServletInputStream(wrapper),
                 new AprServletOutputStream(wrapper, asyncWriteBufferSize));
         ((AprSocketWrapper) wrapper).setLeftOverInput(leftOverInput);
         Socket.timeoutSet(wrapper.getSocket().longValue(), INFINITE_TIMEOUT);

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java?rev=1637932&r1=1637931&r2=1637932&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2Processor.java Mon Nov 10 16:47:08
2014
@@ -36,7 +36,7 @@ public class Nio2Processor extends Abstr
     public Nio2Processor(SocketWrapperBase<Nio2Channel> wrapper, ByteBuffer leftoverInput,
             HttpUpgradeHandler httpUpgradeProcessor, int asyncWriteBufferSize) {
         super(httpUpgradeProcessor,
-                new ServletInputStreamImpl(wrapper),
+                new UpgradeServletInputStream(wrapper),
                 new Nio2ServletOutputStream(wrapper, asyncWriteBufferSize));
 
         wrapper.setTimeout(INFINITE_TIMEOUT);

Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java?rev=1637932&r1=1637931&r2=1637932&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java Mon Nov 10 16:47:08
2014
@@ -36,7 +36,7 @@ public class NioProcessor extends Abstra
     public NioProcessor(SocketWrapperBase<NioChannel> wrapper, ByteBuffer leftoverInput,
             HttpUpgradeHandler httpUpgradeProcessor, int asyncWriteBufferSize) {
         super(httpUpgradeProcessor,
-                new ServletInputStreamImpl(wrapper),
+                new UpgradeServletInputStream(wrapper),
                 new NioServletOutputStream(wrapper, asyncWriteBufferSize));
 
         wrapper.setTimeout(INFINITE_TIMEOUT);

Copied: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
(from r1637931, tomcat/trunk/java/org/apache/coyote/http11/upgrade/ServletInputStreamImpl.java)
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/ServletInputStreamImpl.java&r1=1637931&r2=1637932&rev=1637932&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/ServletInputStreamImpl.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java Mon
Nov 10 16:47:08 2014
@@ -24,10 +24,10 @@ import javax.servlet.ServletInputStream;
 import org.apache.tomcat.util.net.SocketWrapperBase;
 import org.apache.tomcat.util.res.StringManager;
 
-public class ServletInputStreamImpl extends ServletInputStream {
+public class UpgradeServletInputStream extends ServletInputStream {
 
     protected static final StringManager sm = StringManager.getManager(
-            ServletInputStreamImpl.class.getPackage().getName());
+            UpgradeServletInputStream.class.getPackage().getName());
 
     private final SocketWrapperBase<?> socketWrapper;
 
@@ -38,7 +38,7 @@ public class ServletInputStreamImpl exte
     private volatile ClassLoader applicationLoader = null;
 
 
-    public ServletInputStreamImpl(SocketWrapperBase<?> socketWrapper) {
+    public UpgradeServletInputStream(SocketWrapperBase<?> socketWrapper) {
         this.socketWrapper = socketWrapper;
     }
 

Propchange: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message