Author: markt
Date: Thu Jan 24 08:13:45 2013
New Revision: 1437884
URL: http://svn.apache.org/viewvc?rev=1437884&view=rev
Log:
Trailing whitespace police
Modified:
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1437884&r1=1437883&r2=1437884&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Thu Jan
24 08:13:45 2013
@@ -233,18 +233,18 @@ public class OutputBuffer extends Writer
initial = true;
bytesWritten = 0;
charsWritten = 0;
-
+
bb.recycle();
cb.recycle();
outputCharChunk.setChars(null, 0, 0);
closed = false;
suspended = false;
doFlush = false;
-
+
if (conv!= null) {
conv.recycle();
}
-
+
gotEnc = false;
enc = null;
@@ -447,13 +447,13 @@ public class OutputBuffer extends Writer
// ------------------------------------------------- Chars Handling Methods
- /**
+ /**
* Convert the chars to bytes, then send the data to the client.
- *
+ *
* @param buf Char buffer to be written to the response
* @param off Offset
* @param len Length
- *
+ *
* @throws IOException An underlying IOException occurred
*/
@Override
@@ -461,7 +461,7 @@ public class OutputBuffer extends Writer
throws IOException {
outputCharChunk.setChars(buf, off, len);
- while (outputCharChunk.getLength() > 0) {
+ while (outputCharChunk.getLength() > 0) {
conv.convert(outputCharChunk, bb);
if (bb.getLength() == 0) {
// Break out of the loop if more chars are needed to produce
any output
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java?rev=1437884&r1=1437883&r2=1437884&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/B2CConverter.java Thu Jan 24
08:13:45 2013
@@ -114,7 +114,7 @@ public class B2CConverter {
decoder = getCharset(encoding).newDecoder();
}
- /**
+ /**
* Reset the decoder state.
*/
public void recycle() {
@@ -128,11 +128,11 @@ public class B2CConverter {
/**
* Convert the given bytes to characters.
- *
+ *
* @param bc byte input
* @param cc char output
*/
- public void convert(ByteChunk bc, CharChunk cc)
+ public void convert(ByteChunk bc, CharChunk cc)
throws IOException {
if ((bb == null) || (bb.array() != bc.getBuffer())) {
// Create a new byte buffer if anything changed
@@ -144,7 +144,7 @@ public class B2CConverter {
}
if ((cb == null) || (cb.array() != cc.getBuffer())) {
// Create a new char buffer if anything changed
- cb = CharBuffer.wrap(cc.getBuffer(), cc.getEnd(),
+ cb = CharBuffer.wrap(cc.getBuffer(), cc.getEnd(),
cc.getBuffer().length - cc.getEnd());
} else {
// Initialize the char buffer
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java?rev=1437884&r1=1437883&r2=1437884&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java Thu Jan 24
08:13:45 2013
@@ -56,7 +56,7 @@ public final class C2BConverter {
leftovers = CharBuffer.wrap(left);
}
- /**
+ /**
* Reset the encoder state.
*/
public void recycle() {
@@ -70,15 +70,15 @@ public final class C2BConverter {
/**
* Convert the given characters to bytes.
- *
+ *
* @param cc char input
* @param bc byte output
*/
- public void convert(CharChunk cc, ByteChunk bc)
+ public void convert(CharChunk cc, ByteChunk bc)
throws IOException {
if ((bb == null) || (bb.array() != bc.getBuffer())) {
// Create a new byte buffer if anything changed
- bb = ByteBuffer.wrap(bc.getBuffer(), bc.getEnd(),
+ bb = ByteBuffer.wrap(bc.getBuffer(), bc.getEnd(),
bc.getBuffer().length - bc.getEnd());
} else {
// Initialize the byte buffer
@@ -87,7 +87,7 @@ public final class C2BConverter {
}
if ((cb == null) || (cb.array() != cc.getBuffer())) {
// Create a new char buffer if anything changed
- cb = CharBuffer.wrap(cc.getBuffer(), cc.getStart(),
+ cb = CharBuffer.wrap(cc.getBuffer(), cc.getStart(),
cc.getLength());
} else {
// Initialize the char buffer
@@ -132,5 +132,5 @@ public final class C2BConverter {
}
}
}
-
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java?rev=1437884&r1=1437883&r2=1437884&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/buf/UEncoder.java Thu Jan 24
08:13:45 2013
@@ -97,7 +97,7 @@ public final class UEncoder {
bb.recycle();
}
}
-
+
return output;
}
@@ -112,7 +112,7 @@ public final class UEncoder {
out.append(ch);
}
}
-
+
// -------------------- Internal implementation --------------------
private void initSafeChars() {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
