From: markt Date: Wed, 4 Aug 2010 22:50:52 +0000 (+0000) Subject: Couple more whitespace checks. In both cases went with the nospace option since that... X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3527cf0d441fbe541e4a35925a6f11d49dac82f3;p=tomcat7.0 Couple more whitespace checks. In both cases went with the nospace option since that is what the majority of the current code uses git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@982428 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/checkstyle.xml b/checkstyle.xml index d9f8bdfdd..3ae5d7bc7 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -53,5 +53,7 @@ https://sourceforge.net/tracker/?func=detail&aid=3039718&group_id=29721&atid=397078 --> + + \ No newline at end of file diff --git a/java/org/apache/catalina/startup/Tomcat.java b/java/org/apache/catalina/startup/Tomcat.java index 43b50e511..7dc46171d 100644 --- a/java/org/apache/catalina/startup/Tomcat.java +++ b/java/org/apache/catalina/startup/Tomcat.java @@ -673,7 +673,7 @@ public class Tomcat { ctx.setSessionTimeout(30); // MIME mappings - for (int i = 0; i < DEFAULT_MIME_MAPPINGS.length; ) { + for (int i = 0; i < DEFAULT_MIME_MAPPINGS.length;) { ctx.addMimeMapping(DEFAULT_MIME_MAPPINGS[i++], DEFAULT_MIME_MAPPINGS[i++]); } diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java index f2d8a45b4..4cb96a762 100644 --- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java +++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java @@ -202,7 +202,7 @@ public class NioReceiver extends ReceiverBase implements Runnable { Selector tmpsel = selector; Set keys = (isListening()&&tmpsel!=null)?tmpsel.keys():null; if ( keys == null ) return; - for (Iterator iter = keys.iterator(); iter.hasNext(); ) { + for (Iterator iter = keys.iterator(); iter.hasNext();) { SelectionKey key = iter.next(); try { // if (key.interestOps() == SelectionKey.OP_READ) { diff --git a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java index 69745bc0e..c14ba6e3d 100644 --- a/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java +++ b/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java @@ -288,7 +288,7 @@ public class ParallelNioSender extends AbstractSender implements MultiPointSende @Override public boolean keepalive() { boolean result = false; - for ( Iterator> i = nioSenders.entrySet().iterator(); i.hasNext(); ) { + for ( Iterator> i = nioSenders.entrySet().iterator(); i.hasNext();) { Map.Entry entry = i.next(); NioSender sender = entry.getValue(); if ( sender.keepalive() ) { diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java index db6779d37..f399d2afc 100644 --- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java +++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java @@ -708,7 +708,7 @@ public abstract class AbstractHttp11Processor { if (Ascii.toLower(buff[i]) != first) continue; // found first char, now look for a match int myPos = i+1; - for (int srcPos = 1; srcPos < srcEnd; ) { + for (int srcPos = 1; srcPos < srcEnd;) { if (Ascii.toLower(buff[myPos++]) != b[srcPos++]) break; if (srcPos == srcEnd) return i - start; // found it diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java index 35e0815d9..7eca737c2 100644 --- a/java/org/apache/coyote/http11/Http11NioProcessor.java +++ b/java/org/apache/coyote/http11/Http11NioProcessor.java @@ -1212,7 +1212,7 @@ public class Http11NioProcessor extends AbstractHttp11Processor implements Actio if (Ascii.toLower(buff[i]) != first) continue; // found first char, now look for a match int myPos = i+1; - for (int srcPos = 1; srcPos < srcEnd; ) { + for (int srcPos = 1; srcPos < srcEnd;) { if (Ascii.toLower(buff[myPos++]) != b[srcPos++]) break; if (srcPos == srcEnd) return i - start; // found it diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java b/java/org/apache/tomcat/util/buf/ByteChunk.java index 350a9332c..960d1b16c 100644 --- a/java/org/apache/tomcat/util/buf/ByteChunk.java +++ b/java/org/apache/tomcat/util/buf/ByteChunk.java @@ -652,7 +652,7 @@ public final class ByteChunk implements Cloneable, Serializable { if (b1 == null || b2 == null || b2.length > len) { return false; } - for (int i = start, j = 0; i < end && j < b2.length; ) { + for (int i = start, j = 0; i < end && j < b2.length;) { if (b1[i++] != b2[j++]) return false; } @@ -690,7 +690,7 @@ public final class ByteChunk implements Cloneable, Serializable { if( buff[i] != first ) continue; // found first char, now look for a match int myPos=i+1; - for( int srcPos=srcOff + 1; srcPos< srcEnd; ) { + for( int srcPos=srcOff + 1; srcPos< srcEnd;) { if( buff[myPos++] != src.charAt( srcPos++ )) continue mainLoop; } diff --git a/java/org/apache/tomcat/util/buf/CharChunk.java b/java/org/apache/tomcat/util/buf/CharChunk.java index d7887282d..1974c6fc8 100644 --- a/java/org/apache/tomcat/util/buf/CharChunk.java +++ b/java/org/apache/tomcat/util/buf/CharChunk.java @@ -678,7 +678,7 @@ public final class CharChunk implements Cloneable, Serializable, CharSequence { if( buff[i] != first ) continue; // found first char, now look for a match int myPos=i+1; - for( int srcPos=srcOff + 1; srcPos< srcEnd; ) { + for( int srcPos=srcOff + 1; srcPos< srcEnd;) { if( buff[myPos++] != src.charAt( srcPos++ )) break; if( srcPos==srcEnd ) return i-start; // found it diff --git a/java/org/apache/tomcat/util/http/MimeHeaders.java b/java/org/apache/tomcat/util/http/MimeHeaders.java index 39b0d062d..d354e254d 100644 --- a/java/org/apache/tomcat/util/http/MimeHeaders.java +++ b/java/org/apache/tomcat/util/http/MimeHeaders.java @@ -374,7 +374,7 @@ class NamesEnumerator implements Enumeration { private void findNext() { next=null; - for( ; pos< size; pos++ ) { + for(; pos< size; pos++ ) { next=headers.getName( pos ).toString(); for( int j=0; j { private void findNext() { next=null; - for( ; pos< size; pos++ ) { + for(; pos< size; pos++ ) { MessageBytes n1=headers.getName( pos ); if( n1.equalsIgnoreCase( name )) { next=headers.getValue( pos ); diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index 1a452483e..c9faf3e7d 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -1328,7 +1328,7 @@ public class NioEndpoint extends AbstractEndpoint { //timeout Set keys = selector.keys(); int keycount = 0; - for (Iterator iter = keys.iterator(); iter.hasNext(); ) { + for (Iterator iter = keys.iterator(); iter.hasNext();) { SelectionKey key = iter.next(); keycount++; try {