You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2007/03/17 17:18:19 UTC

svn commit: r519362 - in /tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf: CharChunk.java UDecoder.java

Author: markt
Date: Sat Mar 17 09:18:18 2007
New Revision: 519362

URL: http://svn.apache.org/viewvc?view=rev&rev=519362
Log:
Tabs -> 8 spaces

Modified:
    tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/CharChunk.java
    tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/UDecoder.java

Modified: tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/CharChunk.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/CharChunk.java?view=diff&rev=519362&r1=519361&r2=519362
==============================================================================
--- tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/CharChunk.java (original)
+++ tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/CharChunk.java Sat Mar 17 09:18:18 2007
@@ -31,7 +31,7 @@
  * @author Costin Manolache
  * @author Remy Maucherat
  */
-public final class CharChunk implements Cloneable, Serializable, CharSequence {
+public final class CharChunk implements Cloneable, Serializable {
 
     // Input interface, used when the buffer is emptied.
     public static interface CharInputChannel {
@@ -698,7 +698,7 @@
         return buff[index + start];
     }
     
-    public CharSequence subSequence(int start, int end) {
+    public CharChunk subSequence(int start, int end) {
         try {
             CharChunk result = (CharChunk) this.clone();
             result.setOffset(this.start + start);

Modified: tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/UDecoder.java
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/UDecoder.java?view=diff&rev=519362&r1=519361&r2=519362
==============================================================================
--- tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/UDecoder.java (original)
+++ tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/UDecoder.java Sat Mar 17 09:18:18 2007
@@ -30,8 +30,10 @@
  */
 public final class UDecoder {
     
-    protected static final boolean ALLOW_ENCODED_SLASH = 
-        Boolean.valueOf(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH", "false")).booleanValue();
+    protected static final boolean ALLOW_ENCODED_SLASH = Boolean.valueOf(
+            System.getProperty(
+                    "org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH",
+                    "false")).booleanValue();
     
     public UDecoder() 
     {
@@ -49,53 +51,53 @@
     /** URLDecode, will modify the source.
      */
     public void convert( ByteChunk mb, boolean query )
-	throws IOException
+        throws IOException
     {
-	int start=mb.getOffset();
-	byte buff[]=mb.getBytes();
-	int end=mb.getEnd();
+        int start=mb.getOffset();
+        byte buff[]=mb.getBytes();
+        int end=mb.getEnd();
 
-	int idx= ByteChunk.indexOf( buff, start, end, '%' );
+        int idx= ByteChunk.indexOf( buff, start, end, '%' );
         int idx2=-1;
         if( query )
             idx2= ByteChunk.indexOf( buff, start, end, '+' );
-	if( idx<0 && idx2<0 ) {
-	    return;
-	}
-
-	// idx will be the smallest positive inxes ( first % or + )
-	if( idx2 >= 0 && idx2 < idx ) idx=idx2;
-	if( idx < 0 ) idx=idx2;
+        if( idx<0 && idx2<0 ) {
+            return;
+        }
+
+        // idx will be the smallest positive inxes ( first % or + )
+        if( idx2 >= 0 && idx2 < idx ) idx=idx2;
+        if( idx < 0 ) idx=idx2;
     
-	boolean noSlash = !(ALLOW_ENCODED_SLASH || query);
+        boolean noSlash = !(ALLOW_ENCODED_SLASH || query);
 
-	for( int j=idx; j<end; j++, idx++ ) {
-	    if( buff[ j ] == '+' && query) {
-		buff[idx]= (byte)' ' ;
-	    } else if( buff[ j ] != '%' ) {
-		buff[idx]= buff[j];
-	    } else {
-		// read next 2 digits
-		if( j+2 >= end ) {
-		    throw new CharConversionException("EOF");
-		}
-		byte b1= buff[j+1];
-		byte b2=buff[j+2];
-		if( !isHexDigit( b1 ) || ! isHexDigit(b2 ))
-		    throw new CharConversionException( "isHexDigit");
-		
-		j+=2;
-		int res=x2c( b1, b2 );
+        for( int j=idx; j<end; j++, idx++ ) {
+            if( buff[ j ] == '+' && query) {
+                buff[idx]= (byte)' ' ;
+            } else if( buff[ j ] != '%' ) {
+                buff[idx]= buff[j];
+            } else {
+                // read next 2 digits
+                if( j+2 >= end ) {
+                    throw new CharConversionException("EOF");
+                }
+                byte b1= buff[j+1];
+                byte b2=buff[j+2];
+                if( !isHexDigit( b1 ) || ! isHexDigit(b2 ))
+                    throw new CharConversionException( "isHexDigit");
+                
+                j+=2;
+                int res=x2c( b1, b2 );
                 if (noSlash && (res == '/')) {
                     throw new CharConversionException( "noSlash");
                 }
-		buff[idx]=(byte)res;
-	    }
-	}
-
-	mb.setEnd( idx );
-	
-	return;
+                buff[idx]=(byte)res;
+            }
+        }
+
+        mb.setEnd( idx );
+        
+        return;
     }
 
     // -------------------- Additional methods --------------------
@@ -105,7 +107,7 @@
      *  Includes converting  '+' to ' '.
      */
     public void convert( CharChunk mb )
-	throws IOException
+        throws IOException
     {
         convert(mb, true);
     }
@@ -113,57 +115,57 @@
     /** In-buffer processing - the buffer will be modified
      */
     public void convert( CharChunk mb, boolean query )
-	throws IOException
+        throws IOException
     {
-	//	log( "Converting a char chunk ");
-	int start=mb.getOffset();
-	char buff[]=mb.getBuffer();
-	int cend=mb.getEnd();
+        //        log( "Converting a char chunk ");
+        int start=mb.getOffset();
+        char buff[]=mb.getBuffer();
+        int cend=mb.getEnd();
 
-	int idx= CharChunk.indexOf( buff, start, cend, '%' );
+        int idx= CharChunk.indexOf( buff, start, cend, '%' );
         int idx2=-1;
         if( query )
             idx2= CharChunk.indexOf( buff, start, cend, '+' );
-	if( idx<0 && idx2<0 ) {
-	    return;
-	}
-	
-	if( idx2 >= 0 && idx2 < idx ) idx=idx2; 
-	if( idx < 0 ) idx=idx2;
+        if( idx<0 && idx2<0 ) {
+            return;
+        }
+        
+        if( idx2 >= 0 && idx2 < idx ) idx=idx2; 
+        if( idx < 0 ) idx=idx2;
     
-	boolean noSlash = !(ALLOW_ENCODED_SLASH || query);
-	for( int j=idx; j<cend; j++, idx++ ) {
-	    if( buff[ j ] == '+' && query ) {
-		buff[idx]=( ' ' );
-	    } else if( buff[ j ] != '%' ) {
-		buff[idx]=buff[j];
-	    } else {
-		// read next 2 digits
-		if( j+2 >= cend ) {
-		    // invalid
-		    throw new CharConversionException("EOF");
-		}
-		char b1= buff[j+1];
-		char b2=buff[j+2];
-		if( !isHexDigit( b1 ) || ! isHexDigit(b2 ))
-		    throw new CharConversionException("isHexDigit");
-		
-		j+=2;
-		int res=x2c( b1, b2 );
-		if (noSlash && (res == '/')) {
-		    throw new CharConversionException( "noSlash");
-            	}
-		buff[idx]=(char)res;
-	    }
-	}
-	mb.setEnd( idx );
+        boolean noSlash = !(ALLOW_ENCODED_SLASH || query);
+        for( int j=idx; j<cend; j++, idx++ ) {
+            if( buff[ j ] == '+' && query ) {
+                buff[idx]=( ' ' );
+            } else if( buff[ j ] != '%' ) {
+                buff[idx]=buff[j];
+            } else {
+                // read next 2 digits
+                if( j+2 >= cend ) {
+                    // invalid
+                    throw new CharConversionException("EOF");
+                }
+                char b1= buff[j+1];
+                char b2=buff[j+2];
+                if( !isHexDigit( b1 ) || ! isHexDigit(b2 ))
+                    throw new CharConversionException("isHexDigit");
+                
+                j+=2;
+                int res=x2c( b1, b2 );
+                if (noSlash && (res == '/')) {
+                    throw new CharConversionException( "noSlash");
+                    }
+                buff[idx]=(char)res;
+            }
+        }
+        mb.setEnd( idx );
     }
 
     /** URLDecode, will modify the source
      *  Includes converting  '+' to ' '.
      */
     public void convert(MessageBytes mb)
-	throws IOException
+        throws IOException
     {
         convert(mb, true);
     }
@@ -171,24 +173,24 @@
     /** URLDecode, will modify the source
      */
     public void convert(MessageBytes mb, boolean query)
-	throws IOException
+        throws IOException
     {
-	
-	switch (mb.getType()) {
-	case MessageBytes.T_STR:
-	    String strValue=mb.toString();
-	    if( strValue==null ) return;
-	    mb.setString( convert( strValue, query ));
-	    break;
-	case MessageBytes.T_CHARS:
-	    CharChunk charC=mb.getCharChunk();
-	    convert( charC, query );
-	    break;
-	case MessageBytes.T_BYTES:
-	    ByteChunk bytesC=mb.getByteChunk();
-	    convert( bytesC, query );
-	    break;
-	}
+        
+        switch (mb.getType()) {
+        case MessageBytes.T_STR:
+            String strValue=mb.toString();
+            if( strValue==null ) return;
+            mb.setString( convert( strValue, query ));
+            break;
+        case MessageBytes.T_CHARS:
+            CharChunk charC=mb.getCharChunk();
+            convert( charC, query );
+            break;
+        case MessageBytes.T_BYTES:
+            ByteChunk bytesC=mb.getByteChunk();
+            convert( bytesC, query );
+            break;
+        }
     }
 
     // XXX Old code, needs to be replaced !!!!
@@ -201,10 +203,10 @@
     public final String convert(String str, boolean query)
     {
         if (str == null)  return  null;
-	
-	if( (!query || str.indexOf( '+' ) < 0) && str.indexOf( '%' ) < 0 )
-	    return str;
-	
+        
+        if( (!query || str.indexOf( '+' ) < 0) && str.indexOf( '%' ) < 0 )
+            return str;
+        
         StringBuffer dec = new StringBuffer();    // decoded string output
         int strPos = 0;
         int strLen = str.length();
@@ -239,11 +241,11 @@
                 strPos++;
                 continue;
             } else if (metaChar == '%') {
-		// We throw the original exception - the super will deal with
-		// it
-		//                try {
-		dec.append((char)Integer.
-			   parseInt(str.substring(strPos + 1, strPos + 3),16));
+                // We throw the original exception - the super will deal with
+                // it
+                //                try {
+                dec.append((char)Integer.
+                           parseInt(str.substring(strPos + 1, strPos + 3),16));
                 strPos += 3;
             }
         }
@@ -254,27 +256,27 @@
 
 
     private static boolean isHexDigit( int c ) {
-	return ( ( c>='0' && c<='9' ) ||
-		 ( c>='a' && c<='f' ) ||
-		 ( c>='A' && c<='F' ));
+        return ( ( c>='0' && c<='9' ) ||
+                 ( c>='a' && c<='f' ) ||
+                 ( c>='A' && c<='F' ));
     }
     
     private static int x2c( byte b1, byte b2 ) {
-	int digit= (b1>='A') ? ( (b1 & 0xDF)-'A') + 10 :
-	    (b1 -'0');
-	digit*=16;
-	digit +=(b2>='A') ? ( (b2 & 0xDF)-'A') + 10 :
-	    (b2 -'0');
-	return digit;
+        int digit= (b1>='A') ? ( (b1 & 0xDF)-'A') + 10 :
+            (b1 -'0');
+        digit*=16;
+        digit +=(b2>='A') ? ( (b2 & 0xDF)-'A') + 10 :
+            (b2 -'0');
+        return digit;
     }
 
     private static int x2c( char b1, char b2 ) {
-	int digit= (b1>='A') ? ( (b1 & 0xDF)-'A') + 10 :
-	    (b1 -'0');
-	digit*=16;
-	digit +=(b2>='A') ? ( (b2 & 0xDF)-'A') + 10 :
-	    (b2 -'0');
-	return digit;
+        int digit= (b1>='A') ? ( (b1 & 0xDF)-'A') + 10 :
+            (b1 -'0');
+        digit*=16;
+        digit +=(b2>='A') ? ( (b2 & 0xDF)-'A') + 10 :
+            (b2 -'0');
+        return digit;
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org