You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2016/10/28 06:52:09 UTC
svn commit: r1766929 - in /tomcat/tc8.5.x/trunk: ./
java/org/apache/catalina/connector/CoyoteOutputStream.java
java/org/apache/catalina/connector/OutputBuffer.java
java/org/apache/tomcat/util/buf/C2BConverter.java
Author: violetagg
Date: Fri Oct 28 06:52:09 2016
New Revision: 1766929
URL: http://svn.apache.org/viewvc?rev=1766929&view=rev
Log:
Format the code. No functional changes.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 06:52:09 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,176294
7,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1760005,1760022,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762123,1762168,1762172,1762182,1762202,1762288,1762296,1762348,1762353,1762374,1762503,1762505,1762541,1762608,1762710,1762753,1762766,176276
9,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763512,1763516,1763518,1763520,1763529,1763574,1763634-1763635,1763718,1763786,1763798-1763799,1764083,1764425,1764646,1764648-1764649,1764659,1764663,1764682,1764862,1764866-1764867,1764870,1764897,1765133,1765299,1765358,1765439,1765447,1765495,1765502,1765569-1765571,1765579,1765582,1765589-1765590,1765794,1765801,1765813,1765815,1766276,1766514,1766533,1766535,1766664,1766675,1766698
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java?rev=1766929&r1=1766928&r2=1766929&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/CoyoteOutputStream.java Fri Oct 28 06:52:09 2016
@@ -55,8 +55,7 @@ public class CoyoteOutputStream extends
* Prevent cloning the facade.
*/
@Override
- protected Object clone()
- throws CloneNotSupportedException {
+ protected Object clone() throws CloneNotSupportedException {
throw new CloneNotSupportedException();
}
@@ -134,8 +133,7 @@ public class CoyoteOutputStream extends
private boolean checkNonBlockingWrite() {
boolean nonBlocking = !ob.isBlocking();
if (nonBlocking && !ob.isReady()) {
- throw new IllegalStateException(
- sm.getString("coyoteOutputStream.nbNotready"));
+ throw new IllegalStateException(sm.getString("coyoteOutputStream.nbNotready"));
}
return nonBlocking;
}
@@ -155,8 +153,7 @@ public class CoyoteOutputStream extends
@Override
- public void close()
- throws IOException {
+ public void close() throws IOException {
ob.close();
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=1766929&r1=1766928&r2=1766929&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/OutputBuffer.java Fri Oct 28 06:52:09 2016
@@ -51,7 +51,7 @@ public class OutputBuffer extends Writer
private static final StringManager sm = StringManager.getManager(OutputBuffer.class);
- public static final int DEFAULT_BUFFER_SIZE = 8*1024;
+ public static final int DEFAULT_BUFFER_SIZE = 8 * 1024;
/**
* Encoder cache.
@@ -247,8 +247,7 @@ public class OutputBuffer extends Writer
* @throws IOException An underlying IOException occurred
*/
@Override
- public void close()
- throws IOException {
+ public void close() throws IOException {
if (closed) {
return;
@@ -263,8 +262,8 @@ public class OutputBuffer extends Writer
cb.flushBuffer();
}
- if ((!coyoteResponse.isCommitted()) && (coyoteResponse.getContentLengthLong() == -1) &&
- !coyoteResponse.getRequest().method().equals("HEAD")) {
+ if ((!coyoteResponse.isCommitted()) && (coyoteResponse.getContentLengthLong() == -1)
+ && !coyoteResponse.getRequest().method().equals("HEAD")) {
// If this didn't cause a commit of the response, the final content
// length can be calculated. Only do this if this is not a HEAD
// request since in that case no body should have been written and
@@ -275,8 +274,7 @@ public class OutputBuffer extends Writer
}
}
- if (coyoteResponse.getStatus() ==
- HttpServletResponse.SC_SWITCHING_PROTOCOLS) {
+ if (coyoteResponse.getStatus() == HttpServletResponse.SC_SWITCHING_PROTOCOLS) {
doFlush(true);
} else {
doFlush(false);
@@ -286,8 +284,7 @@ public class OutputBuffer extends Writer
// The request should have been completely read by the time the response
// is closed. Further reads of the input a) are pointless and b) really
// confuse AJP (bug 50189) so close the input buffer to prevent them.
- Request req = (Request) coyoteResponse.getRequest().getNote(
- CoyoteAdapter.ADAPTER_NOTES);
+ Request req = (Request) coyoteResponse.getRequest().getNote(CoyoteAdapter.ADAPTER_NOTES);
req.inputBuffer.close();
coyoteResponse.action(ActionCode.CLOSE, null);
@@ -358,8 +355,7 @@ public class OutputBuffer extends Writer
* @throws IOException An underlying IOException occurred
*/
@Override
- public void realWriteBytes(byte buf[], int off, int cnt)
- throws IOException {
+ public void realWriteBytes(byte buf[], int off, int cnt) throws IOException {
if (closed) {
return;
@@ -441,8 +437,7 @@ public class OutputBuffer extends Writer
}
- private void writeBytes(byte b[], int off, int len)
- throws IOException {
+ private void writeBytes(byte b[], int off, int len) throws IOException {
if (closed) {
return;
@@ -478,8 +473,7 @@ public class OutputBuffer extends Writer
}
- public void writeByte(int b)
- throws IOException {
+ public void writeByte(int b) throws IOException {
if (suspended) {
return;
@@ -504,8 +498,7 @@ public class OutputBuffer extends Writer
* @throws IOException An underlying IOException occurred
*/
@Override
- public void realWriteChars(char buf[], int off, int len)
- throws IOException {
+ public void realWriteChars(char buf[], int off, int len) throws IOException {
outputCharChunk.setChars(buf, off, len);
while (outputCharChunk.getLength() > 0) {
@@ -527,8 +520,7 @@ public class OutputBuffer extends Writer
}
@Override
- public void write(int c)
- throws IOException {
+ public void write(int c) throws IOException {
if (suspended) {
return;
@@ -541,8 +533,7 @@ public class OutputBuffer extends Writer
@Override
- public void write(char c[])
- throws IOException {
+ public void write(char c[]) throws IOException {
if (suspended) {
return;
@@ -554,8 +545,7 @@ public class OutputBuffer extends Writer
@Override
- public void write(char c[], int off, int len)
- throws IOException {
+ public void write(char c[], int off, int len) throws IOException {
if (suspended) {
return;
@@ -571,8 +561,7 @@ public class OutputBuffer extends Writer
* Append a string to the buffer
*/
@Override
- public void write(String s, int off, int len)
- throws IOException {
+ public void write(String s, int off, int len) throws IOException {
if (suspended) {
return;
@@ -587,8 +576,7 @@ public class OutputBuffer extends Writer
@Override
- public void write(String s)
- throws IOException {
+ public void write(String s) throws IOException {
if (suspended) {
return;
@@ -637,13 +625,12 @@ public class OutputBuffer extends Writer
private static Charset getCharset(final String encoding) throws IOException {
if (Globals.IS_SECURITY_ENABLED) {
try {
- return AccessController.doPrivileged(
- new PrivilegedExceptionAction<Charset>() {
- @Override
- public Charset run() throws IOException {
- return B2CConverter.getCharset(encoding);
- }
- });
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Charset>() {
+ @Override
+ public Charset run() throws IOException {
+ return B2CConverter.getCharset(encoding);
+ }
+ });
} catch (PrivilegedActionException ex) {
Exception e = ex.getException();
if (e instanceof IOException) {
@@ -659,16 +646,14 @@ public class OutputBuffer extends Writer
private static C2BConverter createConverter(final Charset charset) throws IOException {
- if (Globals.IS_SECURITY_ENABLED){
+ if (Globals.IS_SECURITY_ENABLED) {
try {
- return AccessController.doPrivileged(
- new PrivilegedExceptionAction<C2BConverter>(){
- @Override
- public C2BConverter run() throws IOException{
- return new C2BConverter(charset);
- }
- }
- );
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<C2BConverter>() {
+ @Override
+ public C2BConverter run() throws IOException {
+ return new C2BConverter(charset);
+ }
+ });
} catch (PrivilegedActionException ex) {
Exception e = ex.getException();
if (e instanceof IOException) {
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java?rev=1766929&r1=1766928&r2=1766929&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/buf/C2BConverter.java Fri Oct 28 06:52:09 2016
@@ -41,7 +41,7 @@ public final class C2BConverter {
public C2BConverter(Charset charset) {
encoder = charset.newEncoder();
encoder.onUnmappableCharacter(CodingErrorAction.REPLACE)
- .onMalformedInput(CodingErrorAction.REPLACE);
+ .onMalformedInput(CodingErrorAction.REPLACE);
char[] left = new char[4];
leftovers = CharBuffer.wrap(left);
}
@@ -65,12 +65,10 @@ public final class C2BConverter {
* @param bc byte output
* @throws IOException An encoding error occurred
*/
- public void convert(CharChunk cc, ByteChunk bc)
- throws IOException {
+ 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(),
- bc.getBuffer().length - bc.getEnd());
+ bb = ByteBuffer.wrap(bc.getBuffer(), bc.getEnd(), bc.getBuffer().length - bc.getEnd());
} else {
// Initialize the byte buffer
bb.limit(bc.getBuffer().length);
@@ -78,8 +76,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(),
- cc.getLength());
+ cb = CharBuffer.wrap(cc.getBuffer(), cc.getStart(), cc.getLength());
} else {
// Initialize the char buffer
cb.limit(cc.getEnd());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org