Author: pero
Date: Tue Dec 12 11:18:32 2006
New Revision: 486282
URL: http://svn.apache.org/viewvc?view=rev&rev=486282
Log:
no functional change -- remove tabs, Sorry ;(
Modified:
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpMessage.java
Modified:
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java?view=diff&rev=486282&r1=486281&r2=486282
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProcessor.java
Tue Dec 12 11:18:32 2006
@@ -90,7 +90,7 @@
requestHeaderMessage = new AjpMessage(packetSize);
responseHeaderMessage = new AjpMessage(packetSize);
bodyMessage = new AjpMessage(packetSize);
-
+
if (endpoint.getFirstReadTimeout() > 0) {
readTimeout = endpoint.getFirstReadTimeout() * 1000;
} else {
@@ -107,19 +107,17 @@
// Cause loading of HttpMessages
HttpMessages.getMessage(200);
-
+
// Set the get body message buffer
AjpMessage getBodyMessage = new AjpMessage(128);
getBodyMessage.reset();
getBodyMessage.appendByte(Constants.JK_AJP13_GET_BODY_CHUNK);
- getBodyMessage.appendInt(packetSize -Constants.H_SIZE - 2);
+ getBodyMessage.appendInt(packetSize - Constants.H_SIZE - 2);
getBodyMessage.end();
- getBodyMessageBuffer =
- ByteBuffer.allocateDirect(getBodyMessage.getLen());
- getBodyMessageBuffer.put(getBodyMessage.getBuffer(), 0,
- getBodyMessage.getLen());
-
-
+ getBodyMessageBuffer = ByteBuffer.allocateDirect(getBodyMessage
+ .getLen());
+ getBodyMessageBuffer.put(getBodyMessage.getBuffer(), 0, getBodyMessage
+ .getLen());
}
@@ -1253,10 +1251,10 @@
protected class SocketOutputBuffer
implements OutputBuffer {
- int maxSendPacketSize ;
-
+ int maxSendPacketSize;
+
SocketOutputBuffer(int maxSendSize) {
- this.maxSendPacketSize = maxSendSize - Constants.H_SIZE - 4 ;
+ this.maxSendPacketSize = maxSendSize - Constants.H_SIZE - 4;
}
/**
@@ -1277,7 +1275,7 @@
int len = chunk.getLength();
// 4 - hardcoded, byte[] marshalling overhead
- int chunkSize = maxSendPacketSize ;
+ int chunkSize = maxSendPacketSize;
int off = 0;
while (len > 0) {
int thisTime = len;
Modified:
tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProtocol.java?view=diff&rev=486282&r1=486281&r2=486282
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProtocol.java
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpAprProtocol.java
Tue Dec 12 11:18:32 2006
@@ -419,7 +419,7 @@
public void setPacketSize(int packetSize) {
if(packetSize <Constants.MAX_PACKET_SIZE) {
- packetSize = Constants.MAX_PACKET_SIZE;
+ packetSize = Constants.MAX_PACKET_SIZE;
}
this.packetSize = packetSize;
}
Modified: tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpMessage.java?view=diff&rev=486282&r1=486281&r2=486282
==============================================================================
--- tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpMessage.java
(original)
+++ tomcat/connectors/trunk/jk/java/org/apache/coyote/ajp/AjpMessage.java Tue
Dec 12 11:18:32 2006
@@ -140,7 +140,7 @@
public void appendByte(int val) {
buf[pos++] = (byte) val;
}
-
+
/**
* Append an int (4 bytes) to the message.
@@ -345,7 +345,7 @@
log.error(sm.getString("ajpmessage.read", "" + length));
return 0;
}
-
+
if ((length == 0xFFFF) || (length == -1)) {
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]