Author: markt
Date: Sat Nov 24 18:52:29 2012
New Revision: 1413241
URL: http://svn.apache.org/viewvc?rev=1413241&view=rev
Log:
Rename. Drop Upgrade - it is in the package name
Added:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletInputStream.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
- copied, changed from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletOutputStream.java
Removed:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletOutputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1413241&r1=1413240&r2=1413241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Sat Nov
24 18:52:29 2012
@@ -22,7 +22,7 @@ import javax.servlet.http.ProtocolHandle
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.Processor;
-import org.apache.coyote.http11.upgrade.UpgradeAprProcessor;
+import org.apache.coyote.http11.upgrade.AprProcessor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AbstractEndpoint;
@@ -343,7 +343,7 @@ public class Http11AprProtocol extends A
SocketWrapper<Long> socket,
ProtocolHandler httpUpgradeProcessor)
throws IOException {
- return new UpgradeAprProcessor(socket, httpUpgradeProcessor);
+ return new AprProcessor(socket, httpUpgradeProcessor);
}
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1413241&r1=1413240&r2=1413241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Sat Nov
24 18:52:29 2012
@@ -25,7 +25,7 @@ import javax.servlet.http.ProtocolHandle
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.Processor;
-import org.apache.coyote.http11.upgrade.UpgradeNioProcessor;
+import org.apache.coyote.http11.upgrade.NioProcessor;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.net.AbstractEndpoint;
@@ -306,7 +306,7 @@ public class Http11NioProtocol extends A
SocketWrapper<NioChannel> socket,
ProtocolHandler httpUpgradeProcessor)
throws IOException {
- return new UpgradeNioProcessor(socket, httpUpgradeProcessor,
+ return new NioProcessor(socket, httpUpgradeProcessor,
((Http11NioProtocol)
getProtocol()).getEndpoint().getSelectorPool());
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java?rev=1413241&r1=1413240&r2=1413241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java Sat Nov 24
18:52:29 2012
@@ -23,7 +23,7 @@ import javax.servlet.http.ProtocolHandle
import org.apache.coyote.AbstractProtocol;
import org.apache.coyote.Processor;
-import org.apache.coyote.http11.upgrade.UpgradeBioProcessor;
+import org.apache.coyote.http11.upgrade.BioProcessor;
import org.apache.juli.logging.Log;
import org.apache.tomcat.util.net.AbstractEndpoint;
import org.apache.tomcat.util.net.JIoEndpoint;
@@ -212,7 +212,7 @@ public class Http11Protocol extends Abst
SocketWrapper<Socket> socket,
ProtocolHandler httpUpgradeProcessor)
throws IOException {
- return new UpgradeBioProcessor(socket, httpUpgradeProcessor);
+ return new BioProcessor(socket, httpUpgradeProcessor);
}
@Override
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java (from
r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
Sat Nov 24 18:52:29 2012
@@ -32,19 +32,19 @@ import org.apache.tomcat.util.net.Socket
import org.apache.tomcat.util.net.SocketWrapper;
import org.apache.tomcat.util.res.StringManager;
-public abstract class UpgradeProcessor<S>
+public abstract class AbstractProcessor<S>
implements Processor<S>, WebConnection {
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
private final ProtocolHandler httpUpgradeHandler;
- private final UpgradeServletInputStream upgradeServletInputStream;
- private final UpgradeServletOutputStream upgradeServletOutputStream;
+ private final AbstractServletInputStream upgradeServletInputStream;
+ private final AbstractServletOutputStream upgradeServletOutputStream;
- protected UpgradeProcessor (ProtocolHandler httpUpgradeHandler,
- UpgradeServletInputStream upgradeServletInputStream,
- UpgradeServletOutputStream upgradeServletOutputStream) {
+ protected AbstractProcessor (ProtocolHandler httpUpgradeHandler,
+ AbstractServletInputStream upgradeServletInputStream,
+ AbstractServletOutputStream upgradeServletOutputStream) {
this.httpUpgradeHandler = httpUpgradeHandler;
this.upgradeServletInputStream = upgradeServletInputStream;
this.upgradeServletOutputStream = upgradeServletOutputStream;
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
(from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
Sat Nov 24 18:52:29 2012
@@ -23,7 +23,7 @@ import javax.servlet.ServletInputStream;
import org.apache.tomcat.util.res.StringManager;
-public abstract class UpgradeServletInputStream extends ServletInputStream {
+public abstract class AbstractServletInputStream extends ServletInputStream {
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Sat Nov 24 18:52:29 2012
@@ -23,7 +23,7 @@ import javax.servlet.WriteListener;
import org.apache.tomcat.util.res.StringManager;
-public abstract class UpgradeServletOutputStream extends ServletOutputStream {
+public abstract class AbstractServletOutputStream extends ServletOutputStream {
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
Copied: tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java
(from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprProcessor.java Sat
Nov 24 18:52:29 2012
@@ -21,15 +21,15 @@ import javax.servlet.http.ProtocolHandle
import org.apache.tomcat.jni.Socket;
import org.apache.tomcat.util.net.SocketWrapper;
-public class UpgradeAprProcessor extends UpgradeProcessor<Long> {
+public class AprProcessor extends AbstractProcessor<Long> {
private static final int INFINITE_TIMEOUT = -1;
- public UpgradeAprProcessor(SocketWrapper<Long> wrapper,
+ public AprProcessor(SocketWrapper<Long> wrapper,
ProtocolHandler httpUpgradeProcessor) {
super(httpUpgradeProcessor,
- new UpgradeAprServletInputStream(wrapper),
- new UpgradeAprServletOutputStream(wrapper));
+ new AprServletInputStream(wrapper),
+ new AprServletOutputStream(wrapper));
Socket.timeoutSet(wrapper.getSocket().longValue(), INFINITE_TIMEOUT);
}
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
(from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletInputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletInputStream.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletInputStream.java
Sat Nov 24 18:52:29 2012
@@ -20,12 +20,12 @@ import java.io.IOException;
import org.apache.tomcat.util.net.SocketWrapper;
-public class UpgradeAprServletInputStream extends UpgradeServletInputStream {
+public class AprServletInputStream extends AbstractServletInputStream {
private final long socket;
- public UpgradeAprServletInputStream(SocketWrapper<Long> wrapper) {
+ public AprServletInputStream(SocketWrapper<Long> wrapper) {
this.socket = wrapper.getSocket().longValue();
}
/*
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
(from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletOutputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletOutputStream.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprServletOutputStream.java
Sat Nov 24 18:52:29 2012
@@ -20,12 +20,12 @@ import java.io.IOException;
import org.apache.tomcat.util.net.SocketWrapper;
-public class UpgradeAprServletOutputStream extends UpgradeServletOutputStream {
+public class AprServletOutputStream extends AbstractServletOutputStream {
private final long socket;
- public UpgradeAprServletOutputStream(SocketWrapper<Long> wrapper) {
+ public AprServletOutputStream(SocketWrapper<Long> wrapper) {
this.socket = wrapper.getSocket().longValue();
}
Copied: tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java
(from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioProcessor.java Sat
Nov 24 18:52:29 2012
@@ -23,14 +23,14 @@ import javax.servlet.http.ProtocolHandle
import org.apache.tomcat.util.net.SocketWrapper;
-public class UpgradeBioProcessor extends UpgradeProcessor<Socket> {
+public class BioProcessor extends AbstractProcessor<Socket> {
private static final int INFINITE_TIMEOUT = 0;
- public UpgradeBioProcessor(SocketWrapper<Socket> wrapper,
+ public BioProcessor(SocketWrapper<Socket> wrapper,
ProtocolHandler httpUpgradeProcessor) throws IOException {
- super(httpUpgradeProcessor, new UpgradeBioServletInputStream(wrapper),
- new UpgradeBioServletOutputStream(wrapper));
+ super(httpUpgradeProcessor, new BioServletInputStream(wrapper),
+ new BioServletOutputStream(wrapper));
wrapper.getSocket().setSoTimeout(INFINITE_TIMEOUT);
}
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletInputStream.java
(from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletInputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletInputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletInputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletInputStream.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletInputStream.java
Sat Nov 24 18:52:29 2012
@@ -22,11 +22,11 @@ import java.net.Socket;
import org.apache.tomcat.util.net.SocketWrapper;
-public class UpgradeBioServletInputStream extends UpgradeServletInputStream {
+public class BioServletInputStream extends AbstractServletInputStream {
private final InputStream inputStream;
- public UpgradeBioServletInputStream(SocketWrapper<Socket> wrapper)
+ public BioServletInputStream(SocketWrapper<Socket> wrapper)
throws IOException {
inputStream = wrapper.getSocket().getInputStream();
}
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java
(from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletOutputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletOutputStream.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioServletOutputStream.java
Sat Nov 24 18:52:29 2012
@@ -22,11 +22,11 @@ import java.net.Socket;
import org.apache.tomcat.util.net.SocketWrapper;
-public class UpgradeBioServletOutputStream extends UpgradeServletOutputStream {
+public class BioServletOutputStream extends AbstractServletOutputStream {
private final OutputStream os;
- public UpgradeBioServletOutputStream(SocketWrapper<Socket> wrapper)
+ public BioServletOutputStream(SocketWrapper<Socket> wrapper)
throws IOException {
os = wrapper.getSocket().getOutputStream();
}
Copied: tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java
(from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioProcessor.java Sat
Nov 24 18:52:29 2012
@@ -22,15 +22,15 @@ import org.apache.tomcat.util.net.NioCha
import org.apache.tomcat.util.net.NioSelectorPool;
import org.apache.tomcat.util.net.SocketWrapper;
-public class UpgradeNioProcessor extends UpgradeProcessor<NioChannel> {
+public class NioProcessor extends AbstractProcessor<NioChannel> {
private static final int INFINITE_TIMEOUT = -1;
- public UpgradeNioProcessor(SocketWrapper<NioChannel> wrapper,
+ public NioProcessor(SocketWrapper<NioChannel> wrapper,
ProtocolHandler httpUpgradeProcessor, NioSelectorPool pool) {
super(httpUpgradeProcessor,
- new UpgradeNioServletInputStream(wrapper, pool),
- new UpgradeNioServletOutputStream(wrapper, pool));
+ new NioServletInputStream(wrapper, pool),
+ new NioServletOutputStream(wrapper, pool));
wrapper.setTimeout(INFINITE_TIMEOUT);
}
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
(from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletInputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletInputStream.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletInputStream.java
Sat Nov 24 18:52:29 2012
@@ -26,12 +26,12 @@ import org.apache.tomcat.util.net.NioEnd
import org.apache.tomcat.util.net.NioSelectorPool;
import org.apache.tomcat.util.net.SocketWrapper;
-public class UpgradeNioServletInputStream extends UpgradeServletInputStream {
+public class NioServletInputStream extends AbstractServletInputStream {
private final NioChannel channel;
private final NioSelectorPool pool;
- public UpgradeNioServletInputStream(SocketWrapper<NioChannel> wrapper,
+ public NioServletInputStream(SocketWrapper<NioChannel> wrapper,
NioSelectorPool pool) {
this.channel = wrapper.getSocket();
this.pool = pool;
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
(from r1413240,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletOutputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletOutputStream.java&r1=1413240&r2=1413241&rev=1413241&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletOutputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioServletOutputStream.java
Sat Nov 24 18:52:29 2012
@@ -24,14 +24,14 @@ import org.apache.tomcat.util.net.NioEnd
import org.apache.tomcat.util.net.NioSelectorPool;
import org.apache.tomcat.util.net.SocketWrapper;
-public class UpgradeNioServletOutputStream extends UpgradeServletOutputStream {
+public class NioServletOutputStream extends AbstractServletOutputStream {
private final NioChannel nioChannel;
private final NioSelectorPool pool;
private final int maxWrite;
- public UpgradeNioServletOutputStream(
+ public NioServletOutputStream(
SocketWrapper<NioChannel> wrapper, NioSelectorPool pool) {
nioChannel = wrapper.getSocket();
this.pool = pool;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
