Author: markt
Date: Fri Feb 24 17:30:19 2012
New Revision: 1293351
URL: http://svn.apache.org/viewvc?rev=1293351&view=rev
Log:
Add the ability to write byte[] when using upgrade
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/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.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=1293351&r1=1293350&r2=1293351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeAprProcessor.java
Fri Feb 24 17:30:19 2012
@@ -55,6 +55,12 @@ public class UpgradeAprProcessor extends
}
+ @Override
+ public void write(byte[]b, int off, int len) throws IOException {
+ Socket.send(socket, b, off, len);
+ }
+
+
/*
* Input methods
*/
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=1293351&r1=1293350&r2=1293351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeBioProcessor.java
Fri Feb 24 17:30:19 2012
@@ -58,6 +58,12 @@ public class UpgradeBioProcessor extends
}
+ @Override
+ public void write(byte[]b, int off, int len) throws IOException {
+ outputStream.write(b, off, len);
+ }
+
+
/*
* Input methods
*/
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=1293351&r1=1293350&r2=1293351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeNioProcessor.java
Fri Feb 24 17:30:19 2012
@@ -77,7 +77,12 @@ public class UpgradeNioProcessor extends
@Override
public void write(int b) throws IOException {
- writeToSocket(new byte[] {(byte) b});
+ writeToSocket(new byte[] {(byte) b}, 0, 1);
+ }
+
+ @Override
+ public void write(byte[]b, int off, int len) throws IOException {
+ writeToSocket(b, off, len);
}
/*
@@ -147,10 +152,11 @@ public class UpgradeNioProcessor extends
/*
* Adapted from the NioOutputBuffer
*/
- private synchronized int writeToSocket(byte[] bytes) throws IOException {
+ private synchronized int writeToSocket(byte[] bytes, int off, int len)
+ throws IOException {
nioChannel.getBufHandler().getWriteBuffer().clear();
- nioChannel.getBufHandler().getWriteBuffer().put(bytes);
+ nioChannel.getBufHandler().getWriteBuffer().put(bytes, off, len);
nioChannel.getBufHandler().getWriteBuffer().flip();
int written = 0;
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java?rev=1293351&r1=1293350&r2=1293351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeOutbound.java Fri
Feb 24 17:30:19 2012
@@ -42,4 +42,9 @@ public class UpgradeOutbound extends Out
public void write(int b) throws IOException {
processor.write(b);
}
+
+ @Override
+ public void write(byte[] b, int off, int len) throws IOException {
+ processor.write(b, off, len);
+ }
}
Modified:
tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java?rev=1293351&r1=1293350&r2=1293351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessor.java
Fri Feb 24 17:30:19 2012
@@ -43,6 +43,7 @@ public abstract class UpgradeProcessor<S
// Output methods
public abstract void flush() throws IOException;
public abstract void write(int b) throws IOException;
+ public abstract void write(byte[] b, int off, int len) throws IOException;
// Input methods
public abstract int read() throws IOException;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
