Modified: tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/bcel/classfile/Utility.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/bcel/classfile/Utility.java (original) +++ tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/bcel/classfile/Utility.java Tue Oct 23 11:34:15 2012 @@ -17,10 +17,9 @@ */ package org.apache.tomcat.util.bcel.classfile; +import java.io.DataInput; import java.io.IOException; -import org.apache.tomcat.util.bcel.Constants; -import org.apache.tomcat.util.bcel.util.ByteSequence; /** * Utility functions that do not really belong to any class in particular. @@ -30,396 +29,6 @@ import org.apache.tomcat.util.bcel.util. */ public abstract class Utility { - private static int unwrap( ThreadLocal<Integer> tl ) { - return tl.get().intValue(); - } - - - private static void wrap( ThreadLocal<Integer> tl, int value ) { - tl.set(Integer.valueOf(value)); - } - - private static ThreadLocal<Integer> consumed_chars = - new ThreadLocal<Integer>() { - @Override - protected Integer initialValue() { - return Integer.valueOf(0); - } - };/* How many chars have been consumed - * during parsing in signatureToString(). - * Read by methodSignatureToString(). - * Set by side effect,but only internally. - */ - private static boolean wide = false; /* The `WIDE' instruction is used in the - * byte code to allow 16-bit wide indices - * for local variables. This opcode - * precedes an `ILOAD', e.g.. The opcode - * immediately following takes an extra - * byte which is combined with the - * following byte to form a - * 16-bit value. - */ - - - /** - * Convert bit field of flags into string such as `static final'. - * - * @param access_flags Access flags - * @return String representation of flags - */ - public static final String accessToString( int access_flags ) { - return accessToString(access_flags, false); - } - - - /** - * Convert bit field of flags into string such as `static final'. - * - * Special case: Classes compiled with new compilers and with the - * `ACC_SUPER' flag would be said to be "synchronized". This is - * because SUN used the same value for the flags `ACC_SUPER' and - * `ACC_SYNCHRONIZED'. - * - * @param access_flags Access flags - * @param for_class access flags are for class qualifiers ? - * @return String representation of flags - */ - public static final String accessToString( int access_flags, boolean for_class ) { - StringBuilder buf = new StringBuilder(); - int p = 0; - for (int i = 0; p < Constants.MAX_ACC_FLAG; i++) { // Loop through known flags - p = pow2(i); - if ((access_flags & p) != 0) { - /* Special case: Classes compiled with new compilers and with the - * `ACC_SUPER' flag would be said to be "synchronized". This is - * because SUN used the same value for the flags `ACC_SUPER' and - * `ACC_SYNCHRONIZED'. - */ - if (for_class && ((p == Constants.ACC_SUPER) || (p == Constants.ACC_INTERFACE))) { - continue; - } - buf.append(Constants.ACCESS_NAMES[i]).append(" "); - } - } - return buf.toString().trim(); - } - - - /** - * @param access_flags the class flags - * - * @return "class" or "interface", depending on the ACC_INTERFACE flag - */ - public static final String classOrInterface( int access_flags ) { - return ((access_flags & Constants.ACC_INTERFACE) != 0) ? "interface" : "class"; - } - - - /** - * Disassemble a byte array of JVM byte codes starting from code line - * `index' and return the disassembled string representation. Decode only - * `num' opcodes (including their operands), use -1 if you want to - * decompile everything. - * - * @param code byte code array - * @param constant_pool Array of constants - * @param index offset in `code' array - * <EM>(number of opcodes, not bytes!)</EM> - * @param length number of opcodes to decompile, -1 for all - * @param verbose be verbose, e.g. print constant pool index - * @return String representation of byte codes - */ - public static final String codeToString( byte[] code, ConstantPool constant_pool, int index, - int length, boolean verbose ) { - StringBuilder buf = new StringBuilder(code.length * 20); // Should be sufficient - ByteSequence stream = new ByteSequence(code); - try { - for (int i = 0; i < index; i++) { - codeToString(stream, constant_pool, verbose); - } - for (int i = 0; stream.available() > 0; i++) { - if ((length < 0) || (i < length)) { - String indices = fillup(stream.getIndex() + ":", 6, true, ' '); - buf.append(indices).append(codeToString(stream, constant_pool, verbose)) - .append('\n'); - } - } - } catch (IOException e) { - System.out.println(buf.toString()); - e.printStackTrace(); - throw new ClassFormatException("Byte code error: " + e, e); - } - return buf.toString(); - } - - - /** - * Disassemble a stream of byte codes and return the - * string representation. - * - * @param bytes stream of bytes - * @param constant_pool Array of constants - * @param verbose be verbose, e.g. print constant pool index - * @return String representation of byte code - * - * @throws IOException if a failure from reading from the bytes argument occurs - */ - public static final String codeToString( ByteSequence bytes, ConstantPool constant_pool, - boolean verbose ) throws IOException { - short opcode = (short) bytes.readUnsignedByte(); - int default_offset = 0, low, high, npairs; - int index, vindex, constant; - int[] match, jump_table; - int no_pad_bytes = 0, offset; - StringBuilder buf = new StringBuilder(Constants.OPCODE_NAMES[opcode]); - /* Special case: Skip (0-3) padding bytes, i.e., the - * following bytes are 4-byte-aligned - */ - if ((opcode == Constants.TABLESWITCH) || (opcode == Constants.LOOKUPSWITCH)) { - int remainder = bytes.getIndex() % 4; - no_pad_bytes = (remainder == 0) ? 0 : 4 - remainder; - for (int i = 0; i < no_pad_bytes; i++) { - byte b; - if ((b = bytes.readByte()) != 0) { - System.err.println("Warning: Padding byte != 0 in " - + Constants.OPCODE_NAMES[opcode] + ":" + b); - } - } - // Both cases have a field default_offset in common - default_offset = bytes.readInt(); - } - switch (opcode) { - /* Table switch has variable length arguments. - */ - case Constants.TABLESWITCH: - low = bytes.readInt(); - high = bytes.readInt(); - offset = bytes.getIndex() - 12 - no_pad_bytes - 1; - default_offset += offset; - buf.append("\tdefault = ").append(default_offset).append(", low = ").append(low) - .append(", high = ").append(high).append("("); - jump_table = new int[high - low + 1]; - for (int i = 0; i < jump_table.length; i++) { - jump_table[i] = offset + bytes.readInt(); - buf.append(jump_table[i]); - if (i < jump_table.length - 1) { - buf.append(", "); - } - } - buf.append(")"); - break; - /* Lookup switch has variable length arguments. - */ - case Constants.LOOKUPSWITCH: { - npairs = bytes.readInt(); - offset = bytes.getIndex() - 8 - no_pad_bytes - 1; - match = new int[npairs]; - jump_table = new int[npairs]; - default_offset += offset; - buf.append("\tdefault = ").append(default_offset).append(", npairs = ").append( - npairs).append(" ("); - for (int i = 0; i < npairs; i++) { - match[i] = bytes.readInt(); - jump_table[i] = offset + bytes.readInt(); - buf.append("(").append(match[i]).append(", ").append(jump_table[i]).append(")"); - if (i < npairs - 1) { - buf.append(", "); - } - } - buf.append(")"); - } - break; - /* Two address bytes + offset from start of byte stream form the - * jump target - */ - case Constants.GOTO: - case Constants.IFEQ: - case Constants.IFGE: - case Constants.IFGT: - case Constants.IFLE: - case Constants.IFLT: - case Constants.JSR: - case Constants.IFNE: - case Constants.IFNONNULL: - case Constants.IFNULL: - case Constants.IF_ACMPEQ: - case Constants.IF_ACMPNE: - case Constants.IF_ICMPEQ: - case Constants.IF_ICMPGE: - case Constants.IF_ICMPGT: - case Constants.IF_ICMPLE: - case Constants.IF_ICMPLT: - case Constants.IF_ICMPNE: - buf.append("\t\t#").append((bytes.getIndex() - 1) + bytes.readShort()); - break; - /* 32-bit wide jumps - */ - case Constants.GOTO_W: - case Constants.JSR_W: - buf.append("\t\t#").append(((bytes.getIndex() - 1) + bytes.readInt())); - break; - /* Index byte references local variable (register) - */ - case Constants.ALOAD: - case Constants.ASTORE: - case Constants.DLOAD: - case Constants.DSTORE: - case Constants.FLOAD: - case Constants.FSTORE: - case Constants.ILOAD: - case Constants.ISTORE: - case Constants.LLOAD: - case Constants.LSTORE: - case Constants.RET: - if (wide) { - vindex = bytes.readUnsignedShort(); - wide = false; // Clear flag - } else { - vindex = bytes.readUnsignedByte(); - } - buf.append("\t\t%").append(vindex); - break; - /* - * Remember wide byte which is used to form a 16-bit address in the - * following instruction. Relies on that the method is called again with - * the following opcode. - */ - case Constants.WIDE: - wide = true; - buf.append("\t(wide)"); - break; - /* Array of basic type. - */ - case Constants.NEWARRAY: - buf.append("\t\t<").append(Constants.TYPE_NAMES[bytes.readByte()]).append(">"); - break; - /* Access object/class fields. - */ - case Constants.GETFIELD: - case Constants.GETSTATIC: - case Constants.PUTFIELD: - case Constants.PUTSTATIC: - index = bytes.readUnsignedShort(); - buf.append("\t\t").append( - constant_pool.constantToString(index, Constants.CONSTANT_Fieldref)).append( - (verbose ? " (" + index + ")" : "")); - break; - /* Operands are references to classes in constant pool - */ - case Constants.NEW: - case Constants.CHECKCAST: - buf.append("\t"); - //$FALL-THROUGH$ - case Constants.INSTANCEOF: - index = bytes.readUnsignedShort(); - buf.append("\t<").append( - constant_pool.constantToString(index, Constants.CONSTANT_Class)) - .append(">").append((verbose ? " (" + index + ")" : "")); - break; - /* Operands are references to methods in constant pool - */ - case Constants.INVOKESPECIAL: - case Constants.INVOKESTATIC: - case Constants.INVOKEVIRTUAL: - index = bytes.readUnsignedShort(); - buf.append("\t").append( - constant_pool.constantToString(index, Constants.CONSTANT_Methodref)) - .append((verbose ? " (" + index + ")" : "")); - break; - case Constants.INVOKEINTERFACE: - index = bytes.readUnsignedShort(); - int nargs = bytes.readUnsignedByte(); // historical, redundant - buf.append("\t").append( - constant_pool - .constantToString(index, Constants.CONSTANT_InterfaceMethodref)) - .append(verbose ? " (" + index + ")\t" : "").append(nargs).append("\t") - .append(bytes.readUnsignedByte()); // Last byte is a reserved space - break; - /* Operands are references to items in constant pool - */ - case Constants.LDC_W: - case Constants.LDC2_W: - index = bytes.readUnsignedShort(); - buf.append("\t\t").append( - constant_pool.constantToString(index, constant_pool.getConstant(index) - .getTag())).append((verbose ? " (" + index + ")" : "")); - break; - case Constants.LDC: - index = bytes.readUnsignedByte(); - buf.append("\t\t").append( - constant_pool.constantToString(index, constant_pool.getConstant(index) - .getTag())).append((verbose ? " (" + index + ")" : "")); - break; - /* Array of references. - */ - case Constants.ANEWARRAY: - index = bytes.readUnsignedShort(); - buf.append("\t\t<").append( - compactClassName(constant_pool.getConstantString(index, - Constants.CONSTANT_Class), false)).append(">").append( - (verbose ? " (" + index + ")" : "")); - break; - /* Multidimensional array of references. - */ - case Constants.MULTIANEWARRAY: { - index = bytes.readUnsignedShort(); - int dimensions = bytes.readUnsignedByte(); - buf.append("\t<").append( - compactClassName(constant_pool.getConstantString(index, - Constants.CONSTANT_Class), false)).append(">\t").append(dimensions) - .append((verbose ? " (" + index + ")" : "")); - } - break; - /* Increment local variable. - */ - case Constants.IINC: - if (wide) { - vindex = bytes.readUnsignedShort(); - constant = bytes.readShort(); - wide = false; - } else { - vindex = bytes.readUnsignedByte(); - constant = bytes.readByte(); - } - buf.append("\t\t%").append(vindex).append("\t").append(constant); - break; - default: - if (Constants.NO_OF_OPERANDS[opcode] > 0) { - for (int i = 0; i < Constants.TYPE_OF_OPERANDS[opcode].length; i++) { - buf.append("\t\t"); - switch (Constants.TYPE_OF_OPERANDS[opcode][i]) { - case Constants.T_BYTE: - buf.append(bytes.readByte()); - break; - case Constants.T_SHORT: - buf.append(bytes.readShort()); - break; - case Constants.T_INT: - buf.append(bytes.readInt()); - break; - default: // Never reached - System.err.println("Unreachable default case reached!"); - System.exit(-1); - } - } - } - } - return buf.toString(); - } - - - /** - * Shorten long class names, <em>java/lang/String</em> becomes - * <em>String</em>. - * - * @param str The long class name - * @return Compacted class name - */ - public static final String compactClassName( String str ) { - return compactClassName(str, true); - } - - /** * Shorten long class name <em>str</em>, i.e., chop off the <em>prefix</em>, * if the @@ -459,198 +68,6 @@ public abstract class Utility { } - // Guess what this does - private static final int pow2( int n ) { - return 1 << n; - } - - - /** - * Replace all occurrences of <em>old</em> in <em>str</em> with <em>new</em>. - * - * @param str String to permute - * @param old String to be replaced - * @param new_ Replacement string - * @return new String object - */ - public static final String replace( String str, String old, String new_ ) { - int index, old_index; - try { - if (str.indexOf(old) != -1) { // `old' found in str - StringBuffer buf = new StringBuffer(); - old_index = 0; // String start offset - // While we have something to replace - while ((index = str.indexOf(old, old_index)) != -1) { - buf.append(str.substring(old_index, index)); // append prefix - buf.append(new_); // append replacement - old_index = index + old.length(); // Skip `old'.length chars - } - buf.append(str.substring(old_index)); // append rest of string - str = buf.toString(); - } - } catch (StringIndexOutOfBoundsException e) { // Should not occur - System.err.println(e); - } - return str; - } - - - /** - * Converts signature to string with all class names compacted. - * - * @param signature to convert - * @return Human readable signature - */ - public static final String signatureToString( String signature ) { - return signatureToString(signature, true); - } - - - /** - * The field signature represents the value of an argument to a function or - * the value of a variable. It is a series of bytes generated by the - * following grammar: - * - * <PRE> - * <field_signature> ::= <field_type> - * <field_type> ::= <base_type>|<object_type>|<array_type> - * <base_type> ::= B|C|D|F|I|J|S|Z - * <object_type> ::= L<fullclassname>; - * <array_type> ::= [<field_type> - * - * The meaning of the base types is as follows: - * B byte signed byte - * C char character - * D double double precision IEEE float - * F float single precision IEEE float - * I int integer - * J long long integer - * L<fullclassname>; ... an object of the given class - * S short signed short - * Z boolean true or false - * [<field sig> ... array - * </PRE> - * - * This method converts this string into a Java type declaration such as - * `String[]' and throws a `ClassFormatException' when the parsed type is - * invalid. - * - * @param signature Class signature - * @param chopit Flag that determines whether chopping is executed or not - * @return Java type declaration - * @throws ClassFormatException - */ - public static final String signatureToString( String signature, boolean chopit ) { - //corrected concurrent private static field acess - wrap(consumed_chars, 1); // This is the default, read just one char like `B' - try { - switch (signature.charAt(0)) { - case 'B': - return "byte"; - case 'C': - return "char"; - case 'D': - return "double"; - case 'F': - return "float"; - case 'I': - return "int"; - case 'J': - return "long"; - case 'L': { // Full class name - int index = signature.indexOf(';'); // Look for closing `;' - if (index < 0) { - throw new ClassFormatException("Invalid signature: " + signature); - } - //corrected concurrent private static field acess - wrap(consumed_chars, index + 1); // "Lblabla;" `L' and `;' are removed - return compactClassName(signature.substring(1, index), chopit); - } - case 'S': - return "short"; - case 'Z': - return "boolean"; - case '[': { // Array declaration - int n; - StringBuilder brackets; - String type; - int consumed_chars; // Shadows global var - brackets = new StringBuilder(); // Accumulate []'s - // Count opening brackets and look for optional size argument - for (n = 0; signature.charAt(n) == '['; n++) { - brackets.append("[]"); - } - consumed_chars = n; // Remember value - // The rest of the string denotes a `<field_type>' - type = signatureToString(signature.substring(n), chopit); - //corrected concurrent private static field acess - //Utility.consumed_chars += consumed_chars; is replaced by: - int _temp = unwrap(Utility.consumed_chars) + consumed_chars; - wrap(Utility.consumed_chars, _temp); - return type + brackets.toString(); - } - case 'V': - return "void"; - default: - throw new ClassFormatException("Invalid signature: `" + signature + "'"); - } - } catch (StringIndexOutOfBoundsException e) { // Should never occur - throw new ClassFormatException("Invalid signature: " + signature, e); - } - } - - /** - * Convert (signed) byte to (unsigned) short value, i.e., all negative - * values become positive. - */ - private static final short byteToShort( byte b ) { - return (b < 0) ? (short) (256 + b) : (short) b; - } - - - /** Convert bytes into hexadecimal string - * - * @param bytes an array of bytes to convert to hexadecimal - * - * @return bytes as hexadecimal string, e.g. 00 FA 12 ... - */ - public static final String toHexString( byte[] bytes ) { - StringBuilder buf = new StringBuilder(); - for (int i = 0; i < bytes.length; i++) { - short b = byteToShort(bytes[i]); - String hex = Integer.toString(b, 0x10); - if (b < 0x10) { - buf.append('0'); - } - buf.append(hex); - if (i < bytes.length - 1) { - buf.append(' '); - } - } - return buf.toString(); - } - - /** - * Fillup char with up to length characters with char `fill' and justify it left or right. - * - * @param str string to format - * @param length length of desired string - * @param left_justify format left or right - * @param fill fill character - * @return formatted string - */ - public static final String fillup( String str, int length, boolean left_justify, char fill ) { - int len = length - str.length(); - char[] buf = new char[(len < 0) ? 0 : len]; - for (int j = 0; j < buf.length; j++) { - buf[j] = fill; - } - if (left_justify) { - return str + new String(buf); - } - return new String(buf) + str; - } - // A-Z, g-z, _, $ private static final int FREE_CHARS = 48; static int[] CHAR_MAP = new int[FREE_CHARS]; @@ -674,34 +91,33 @@ public abstract class Utility { MAP_CHAR['_'] = j; } - /** - * Escape all occurences of newline chars '\n', quotes \", etc. - */ - public static final String convertString( String label ) { - char[] ch = label.toCharArray(); - StringBuilder buf = new StringBuilder(); - for (int i = 0; i < ch.length; i++) { - switch (ch[i]) { - case '\n': - buf.append("\\n"); - break; - case '\r': - buf.append("\\r"); - break; - case '\"': - buf.append("\\\""); - break; - case '\'': - buf.append("\\'"); - break; - case '\\': - buf.append("\\\\"); - break; - default: - buf.append(ch[i]); - break; - } - } - return buf.toString(); + protected static void swallowCodeException(DataInput file) + throws IOException { + file.readUnsignedShort(); // Unused start_pc + file.readUnsignedShort(); // Unused end_pc + file.readUnsignedShort(); // Unused handler_pc + file.readUnsignedShort(); // Unused catch_type + } + + protected static void swallowInnerClass(DataInput file) + throws IOException { + file.readUnsignedShort(); // Unused inner_class_index + file.readUnsignedShort(); // Unused outer_class_index + file.readUnsignedShort(); // Unused inner_name_index + file.readUnsignedShort(); // Unused inner_access_flags + } + + protected static void swallowLineNumber(DataInput file) throws IOException { + file.readUnsignedShort(); // Unused start_pc + file.readUnsignedShort(); // Unused line_number + } + + protected static void swallowLocalVariable(DataInput file) + throws IOException { + file.readUnsignedShort(); // Unused start_pc + file.readUnsignedShort(); // Unused length + file.readUnsignedShort(); // Unused name_index + file.readUnsignedShort(); // Unused signature_index + file.readUnsignedShort(); // Unused index } }
Propchange: tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/http/fileupload/ ------------------------------------------------------------------------------ Merged /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload:r1384081-1401252 Modified: tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java (original) +++ tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/http/fileupload/FileCleaningTracker.java Tue Oct 23 11:34:15 2012 @@ -33,7 +33,7 @@ import java.util.Vector; * In an environment with multiple class loaders (a servlet container, for * example), you should consider stopping the background thread if it is no * longer needed. This is done by invoking the method - * {@link #exitWhenFinished}, typically in + * {@link #exitWhenFinished()}, typically in * {@link javax.servlet.ServletContextListener#contextDestroyed} or similar. * * @author Noel Bergman Modified: tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/modeler/BaseModelMBean.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/modeler/BaseModelMBean.java (original) +++ tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Tue Oct 23 11:34:15 2012 @@ -270,7 +270,7 @@ public class BaseModelMBean implements D * * @exception MBeanException if the initializer of an object * throws an exception - * @exception ReflectioNException if a Java reflection exception + * @exception ReflectionException if a Java reflection exception * occurs when invoking a method */ @Override @@ -538,8 +538,6 @@ public class BaseModelMBean implements D * * @exception InstanceNotFoundException if the managed resource object * cannot be found - * @exception InvalidTargetObjectTypeException if this ModelMBean is - * asked to handle a reference type it cannot deal with * @exception MBeanException if the initializer of the object throws * an exception * @exception RuntimeOperationsException if the managed resource or the Modified: tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/modeler/ManagedBean.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/modeler/ManagedBean.java (original) +++ tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/modeler/ManagedBean.java Tue Oct 23 11:34:15 2012 @@ -253,8 +253,6 @@ public class ManagedBean implements java * * @exception InstanceNotFoundException if the managed resource * object cannot be found - * @exception javax.management.modelmbean.InvalidTargetObjectTypeException - * if our MBean cannot handle object references (should never happen) * @exception MBeanException if a problem occurs instantiating the * <code>ModelMBean</code> instance * @exception RuntimeOperationsException if a JMX runtime error occurs @@ -281,8 +279,6 @@ public class ManagedBean implements java * * @exception InstanceNotFoundException if the managed resource * object cannot be found - * @exception javax.management.modelmbean.InvalidTargetObjectTypeException - * if our MBean cannot handle object references (should never happen) * @exception MBeanException if a problem occurs instantiating the * <code>ModelMBean</code> instance * @exception RuntimeOperationsException if a JMX runtime error occurs Modified: tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/sandbox/trunk-resources/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Oct 23 11:34:15 2012 @@ -1121,6 +1121,9 @@ public class AprEndpoint extends Abstrac */ public class Poller extends Thread { + public static final int FLAGS_READ = Poll.APR_POLLIN; + public static final int FLAGS_WRITE = Poll.APR_POLLOUT; + // Need two pollsets since the socketTimeout and the keep-alive timeout // can have different values. private long connectionPollset = 0; @@ -1129,6 +1132,7 @@ public class AprEndpoint extends Abstrac private long[] addSocket; private int[] addSocketTimeout; + private int[] addSocketFlags; private volatile int addCount = 0; @@ -1161,7 +1165,8 @@ public class AprEndpoint extends Abstrac desc = new long[size * 2]; keepAliveCount = 0; addSocket = new long[size]; - addSocketTimeout= new int[size]; + addSocketTimeout = new int[size]; + addSocketFlags = new int[size]; addCount = 0; } @@ -1215,8 +1220,10 @@ public class AprEndpoint extends Abstrac * @param socket to add to the poller * @param timeout read timeout (in milliseconds) to use with this * socket. Use -1 for infinite timeout + * @param flags flags that define the events that are to be polled + * for */ - public void add(long socket, int timeout) { + public void add(long socket, int timeout, int flags) { if (!running) { processSocket(socket, SocketStatus.STOP); return; @@ -1235,6 +1242,7 @@ public class AprEndpoint extends Abstrac } addSocket[addCount] = socket; addSocketTimeout[addCount] = timeout; + addSocketFlags[addCount] = flags; addCount++; // TODO: interrupt poll ? this.notify(); @@ -1294,7 +1302,7 @@ public class AprEndpoint extends Abstrac } int rv = Poll.addWithTimeout( connectionPollset, addSocket[i], - Poll.APR_POLLIN, timeout); + addSocketFlags[i], timeout); if (rv == Status.APR_SUCCESS) { successCount++; } else { @@ -1677,7 +1685,8 @@ public class AprEndpoint extends Abstrac // If all done put the socket back in the poller for // processing of further requests getPoller().add(state.socket, - getKeepAliveTimeout()); + getKeepAliveTimeout(), + Poller.FLAGS_READ); } else { // Close the socket since this is // the end of not keep-alive request. @@ -1771,7 +1780,7 @@ public class AprEndpoint extends Abstrac if (!deferAccept) { if (setSocketOptions(socket.getSocket().longValue())) { getPoller().add(socket.getSocket().longValue(), - getSoTimeout()); + getSoTimeout(), Poller.FLAGS_READ); } else { // Close socket and pool destroySocket(socket.getSocket().longValue()); Modified: tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java (original) +++ tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java Tue Oct 23 11:34:15 2012 @@ -211,7 +211,7 @@ public class DataSourceProxy implements } } - public int getPoolSize() throws SQLException{ + public int getPoolSize() { final ConnectionPool p = pool; if (p == null) return 0; else return p.getSize(); @@ -1296,9 +1296,6 @@ public class DataSourceProxy implements getPoolProperties().setPropagateInterruptState(propagateInterruptState); } - /** - * {@inheritDoc} - */ public void purge() { try { createPool().purge(); @@ -1307,9 +1304,6 @@ public class DataSourceProxy implements } } - /** - * {@inheritDoc} - */ public void purgeOnReturn() { try { createPool().purgeOnReturn(); @@ -1317,5 +1311,4 @@ public class DataSourceProxy implements log.error("Unable to purge pool.",x); } } - } Modified: tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java (original) +++ tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java Tue Oct 23 11:34:15 2012 @@ -62,7 +62,7 @@ public abstract class JdbcInterceptor im public static final String ISWRAPPERFOR_VAL = "isWrapperFor"; /** - * {@link java.sql.Connection#isValid(boolean)} method name + * {@link java.sql.Connection#isValid(int)} method name */ public static final String ISVALID_VAL = "isValid"; Modified: tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java (original) +++ tomcat/sandbox/trunk-resources/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java Tue Oct 23 11:34:15 2012 @@ -365,7 +365,6 @@ public class PooledConnection { * Returns true if the connection pool is configured * to do validation for a certain action. * @param action - * @return */ private boolean doValidate(int action) { if (action == PooledConnection.VALIDATE_BORROW && Modified: tomcat/sandbox/trunk-resources/res/checkstyle/javax-import-control.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/res/checkstyle/javax-import-control.xml?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/res/checkstyle/javax-import-control.xml (original) +++ tomcat/sandbox/trunk-resources/res/checkstyle/javax-import-control.xml Tue Oct 23 11:34:15 2012 @@ -33,6 +33,10 @@ <subpackage name="mail"> <allow pkg="javax.mail"/> </subpackage> + <subpackage name="net.websocket"> + <allow pkg="javax.net.websocket"/> + <allow pkg="javax.net.websocket.extensions"/> + </subpackage> <subpackage name="persistence"> <allow pkg="javax.persistence"/> </subpackage> Modified: tomcat/sandbox/trunk-resources/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java (original) +++ tomcat/sandbox/trunk-resources/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java Tue Oct 23 11:34:15 2012 @@ -358,12 +358,11 @@ public class TestNonBlockingAPI extends public void onDataAvailable() { try { ServletInputStream in = ctx.getRequest().getInputStream(); - int avail = 0; String s = ""; - while ((avail = in.dataAvailable()) > 0) { - byte[] b = new byte[avail]; - in.read(b); - s += new String(b); + byte[] b = new byte[8192]; + while (in.isReady()) { + int read = in.read(b); + s += new String(b, 0, read); } System.out.println(s); if ("FINISHED".equals(s)) { Modified: tomcat/sandbox/trunk-resources/test/org/apache/tomcat/util/net/TestSsl.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/test/org/apache/tomcat/util/net/TestSsl.java?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/test/org/apache/tomcat/util/net/TestSsl.java (original) +++ tomcat/sandbox/trunk-resources/test/org/apache/tomcat/util/net/TestSsl.java Tue Oct 23 11:34:15 2012 @@ -193,8 +193,14 @@ public class TestSsl extends TomcatBaseT BufferedReader br = new BufferedReader(r); String line = br.readLine(); while (line != null) { - // For testing System.out.println(line); - line = br.readLine(); + // For debugging System.out.println(line); + // Linux clients see a Connection Reset in some circumstances and a + // clean close in others. + try { + line = br.readLine(); + } catch (IOException ioe) { + line = null; + } } } Modified: tomcat/sandbox/trunk-resources/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/webapps/docs/changelog.xml?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/webapps/docs/changelog.xml (original) +++ tomcat/sandbox/trunk-resources/webapps/docs/changelog.xml Tue Oct 23 11:34:15 2012 @@ -105,6 +105,11 @@ default value will never go above 2 regardless of available processors. (fhanik) </scode> + <fix> + <bug>54010</bug>: Remove some unnecessary code (duplicate calls to + configure the scheme as https for AJP requests originally received over + HTTPS). (markt) + </fix> </changelog> </subsection> <subsection name="Web applications"> Modified: tomcat/sandbox/trunk-resources/webapps/examples/WEB-INF/jsp/applet/Clock2.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/trunk-resources/webapps/examples/WEB-INF/jsp/applet/Clock2.java?rev=1401253&r1=1401252&r2=1401253&view=diff ============================================================================== --- tomcat/sandbox/trunk-resources/webapps/examples/WEB-INF/jsp/applet/Clock2.java (original) +++ tomcat/sandbox/trunk-resources/webapps/examples/WEB-INF/jsp/applet/Clock2.java Tue Oct 23 11:34:15 2012 @@ -53,13 +53,19 @@ public class Clock2 extends Applet imple try { setBackground(new Color(Integer.parseInt(getParameter("bgcolor"),16))); - } catch (Exception E) { } + } catch (Exception e) { + // Ignore + } try { handColor = new Color(Integer.parseInt(getParameter("fgcolor1"),16)); - } catch (Exception E) { } + } catch (Exception e) { + // Ignore + } try { numberColor = new Color(Integer.parseInt(getParameter("fgcolor2"),16)); - } catch (Exception E) { } + } catch (Exception e) { + // Ignore + } resize(300,300); // Set clock window size } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
