Author: markt
Date: Sat Nov 24 17:53:52 2012
New Revision: 1413222
URL: http://svn.apache.org/viewvc?rev=1413222&view=rev
Log:
Rename
Added:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletInputStream.java
- copied, changed from r1413221,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprUpgradeServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletInputStream.java
- copied, changed from r1413221,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioUpgradeServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletInputStream.java
- copied, changed from r1413221,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioUpgradeServletInputStream.java
Removed:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprUpgradeServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioUpgradeServletInputStream.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioUpgradeServletInputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeServletInputStream.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java?rev=1413222&r1=1413221&r2=1413222&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
Sat Nov 24 17:53:52 2012
@@ -30,7 +30,7 @@ public class UpgradeAprProcessor extends
public UpgradeAprProcessor(SocketWrapper<Long> wrapper,
ProtocolHandler httpUpgradeProcessor) {
super(httpUpgradeProcessor,
- new AprUpgradeServletInputStream(wrapper),
+ new UpgradeAprServletInputStream(wrapper),
new
AprUpgradeServletOutputStream(wrapper.getSocket().longValue()));
Socket.timeoutSet(wrapper.getSocket().longValue(), INFINITE_TIMEOUT);
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletInputStream.java
(from r1413221,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprUpgradeServletInputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletInputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletInputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprUpgradeServletInputStream.java&r1=1413221&r2=1413222&rev=1413222&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/AprUpgradeServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprServletInputStream.java
Sat Nov 24 17:53:52 2012
@@ -20,11 +20,11 @@ import java.io.IOException;
import org.apache.tomcat.util.net.SocketWrapper;
-public class AprUpgradeServletInputStream extends UpgradeServletInputStream {
+public class UpgradeAprServletInputStream extends UpgradeServletInputStream {
private final long socket;
- public AprUpgradeServletInputStream(SocketWrapper<Long> wrapper) {
+ public UpgradeAprServletInputStream(SocketWrapper<Long> wrapper) {
this.socket = wrapper.getSocket().longValue();
}
/*
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java?rev=1413222&r1=1413221&r2=1413222&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
Sat Nov 24 17:53:52 2012
@@ -30,7 +30,7 @@ public class UpgradeBioProcessor extends
public UpgradeBioProcessor(SocketWrapper<Socket> wrapper,
ProtocolHandler httpUpgradeProcessor) throws IOException {
- super(httpUpgradeProcessor, new BioUpgradeServletInputStream(wrapper),
+ super(httpUpgradeProcessor, new UpgradeBioServletInputStream(wrapper),
new BioUpgradeServletOutputStream(wrapper));
wrapper.getSocket().setSoTimeout(INFINITE_TIMEOUT);
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletInputStream.java
(from r1413221,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioUpgradeServletInputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletInputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletInputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioUpgradeServletInputStream.java&r1=1413221&r2=1413222&rev=1413222&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/BioUpgradeServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioServletInputStream.java
Sat Nov 24 17:53:52 2012
@@ -22,11 +22,11 @@ import java.net.Socket;
import org.apache.tomcat.util.net.SocketWrapper;
-public class BioUpgradeServletInputStream extends UpgradeServletInputStream {
+public class UpgradeBioServletInputStream extends UpgradeServletInputStream {
private final InputStream inputStream;
- public BioUpgradeServletInputStream(SocketWrapper<Socket> wrapper)
+ public UpgradeBioServletInputStream(SocketWrapper<Socket> wrapper)
throws IOException {
inputStream = wrapper.getSocket().getInputStream();
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java?rev=1413222&r1=1413221&r2=1413222&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
Sat Nov 24 17:53:52 2012
@@ -33,7 +33,7 @@ public class UpgradeNioProcessor extends
public UpgradeNioProcessor(SocketWrapper<NioChannel> wrapper,
ProtocolHandler httpUpgradeProcessor, NioSelectorPool pool) {
super(httpUpgradeProcessor,
- new NioUpgradeServletInputStream(wrapper, pool),
+ new UpgradeNioServletInputStream(wrapper, pool),
new NioUpgradeServletOutputStream(wrapper, pool));
wrapper.setTimeout(INFINITE_TIMEOUT);
Copied:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletInputStream.java
(from r1413221,
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioUpgradeServletInputStream.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletInputStream.java?p2=tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletInputStream.java&p1=tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioUpgradeServletInputStream.java&r1=1413221&r2=1413222&rev=1413222&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/coyote/http11/upgrade/NioUpgradeServletInputStream.java
(original)
+++
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioServletInputStream.java
Sat Nov 24 17:53:52 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 NioUpgradeServletInputStream extends UpgradeServletInputStream {
+public class UpgradeNioServletInputStream extends UpgradeServletInputStream {
private final NioChannel channel;
private final NioSelectorPool pool;
- public NioUpgradeServletInputStream(SocketWrapper<NioChannel> wrapper,
+ public UpgradeNioServletInputStream(SocketWrapper<NioChannel> wrapper,
NioSelectorPool pool) {
this.channel = wrapper.getSocket();
this.pool = pool;
Modified:
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeServletInputStream.java?rev=1413222&r1=1413221&r2=1413222&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeServletInputStream.java
(original)
+++
tomcat/trunk/test/org/apache/coyote/http11/upgrade/TestUpgradeServletInputStream.java
Sat Nov 24 17:53:52 2012
@@ -90,7 +90,7 @@ public class TestUpgradeServletInputStre
tomcat.start();
- // Use raw socket so the necessary control is available post the HTTP
+ // Use raw socket so the necessary control is available after the HTTP
// upgrade
Socket socket =
SocketFactory.getDefault().createSocket("localhost",
getPort());
@@ -181,14 +181,12 @@ public class TestUpgradeServletInputStre
int read = sis.read(buffer);
if (read > 0) {
System.out.print(new String(buffer, 0, read));
- /*
if (sos.canWrite()) {
sos.write(buffer, 0, read);
} else {
throw new IOException("Unable to echo data. " +
"canWrite() returned false");
}
- */
}
}
} catch (IOException ioe) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
