From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 5 Nov 2009 01:22:13 +0000 (+0000)
Subject: Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=888b76dd298859abcd4eb66287979d26af136b55;p=tomcat7.0

Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb
This is the final patch for this bug fix.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@832957 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/tomcat/buildutil/Txt2Html.java b/java/org/apache/tomcat/buildutil/Txt2Html.java
index 18fc4de86..8110686ff 100644
--- a/java/org/apache/tomcat/buildutil/Txt2Html.java
+++ b/java/org/apache/tomcat/buildutil/Txt2Html.java
@@ -75,6 +75,7 @@ public class Txt2Html
      * @param BuildException Thrown if an error occurs during execution of
      *    this task.
      */
+    @Override
     public void execute() 
         throws BuildException 
     {
diff --git a/java/org/apache/tomcat/util/buf/B2CConverter.java b/java/org/apache/tomcat/util/buf/B2CConverter.java
index e695fbfbb..639fc971f 100644
--- a/java/org/apache/tomcat/util/buf/B2CConverter.java
+++ b/java/org/apache/tomcat/util/buf/B2CConverter.java
@@ -128,11 +128,13 @@ final class  ReadConvertor extends InputStreamReader {
     
     /** Overriden - will do nothing but reset internal state.
      */
+    @Override
     public  final void close() throws IOException {
         // NOTHING
         // Calling super.close() would reset out and cb.
     }
     
+    @Override
     public  final int read(char cbuf[], int off, int len)
         throws IOException
     {
@@ -167,15 +169,18 @@ final class IntermediateInputStream extends InputStream {
     public IntermediateInputStream() {
     }
     
+    @Override
     public  final void close() throws IOException {
         // shouldn't be called - we filter it out in writer
         throw new IOException("close() called - shouldn't happen ");
     }
     
+    @Override
     public  final  int read(byte cbuf[], int off, int len) throws IOException {
         return bc.substract(cbuf, off, len);
     }
     
+    @Override
     public  final int read() throws IOException {
         return bc.substract();
     }
diff --git a/java/org/apache/tomcat/util/buf/ByteChunk.java b/java/org/apache/tomcat/util/buf/ByteChunk.java
index ce3b4df82..94423bf40 100644
--- a/java/org/apache/tomcat/util/buf/ByteChunk.java
+++ b/java/org/apache/tomcat/util/buf/ByteChunk.java
@@ -481,6 +481,7 @@ public final class ByteChunk implements Cloneable, Serializable {
     
     // -------------------- Conversion and getters --------------------
 
+    @Override
     public String toString() {
         if (null == buff) {
             return null;
diff --git a/java/org/apache/tomcat/util/buf/C2BConverter.java b/java/org/apache/tomcat/util/buf/C2BConverter.java
index b5d3b426e..95a0ab939 100644
--- a/java/org/apache/tomcat/util/buf/C2BConverter.java
+++ b/java/org/apache/tomcat/util/buf/C2BConverter.java
@@ -177,6 +177,7 @@ public final class C2BConverter {
     
     /** Overriden - will do nothing but reset internal state.
      */
+    @Override
     public  final void close() throws IOException {
 	// NOTHING
 	// Calling super.close() would reset out and cb.
@@ -185,12 +186,14 @@ public final class C2BConverter {
     /**
      *  Flush the characters only
      */ 
+    @Override
     public  final void flush() throws IOException {
 	// Will flushBuffer and out()
 	// flushBuffer put any remaining chars in the byte[] 
 	super.flush();
     }
     
+    @Override
     public  final void write(char cbuf[], int off, int len) throws IOException {
 	// will do the conversion and call write on the output stream
 	super.write( cbuf, off, len );
@@ -226,16 +229,19 @@ final class IntermediateOutputStream extends OutputStream {
 	    this.tbuff=tbuff;
     }
     
+    @Override
     public  final void close() throws IOException {
 	// shouldn't be called - we filter it out in writer
 	throw new IOException("close() called - shouldn't happen ");
     }
     
+    @Override
     public  final void flush() throws IOException {
 	// nothing - write will go directly to the buffer,
 	// we don't keep any state
     }
     
+    @Override
     public  final  void write(byte cbuf[], int off, int len) throws IOException {
 	// will do the conversion and call write on the output stream
 	if( enabled ) {
@@ -243,6 +249,7 @@ final class IntermediateOutputStream extends OutputStream {
 	}
     }
     
+    @Override
     public  final void write( int i ) throws IOException {
 	throw new IOException("write( int ) called - shouldn't happen ");
     }
diff --git a/java/org/apache/tomcat/util/buf/CharChunk.java b/java/org/apache/tomcat/util/buf/CharChunk.java
index 91ece8b98..95cb70d9f 100644
--- a/java/org/apache/tomcat/util/buf/CharChunk.java
+++ b/java/org/apache/tomcat/util/buf/CharChunk.java
@@ -483,6 +483,7 @@ public final class CharChunk implements Cloneable, Serializable, CharSequence {
     
     // -------------------- Conversion and getters --------------------
 
+    @Override
     public String toString() {
         if (null == buff) {
             return null;
diff --git a/java/org/apache/tomcat/util/buf/MessageBytes.java b/java/org/apache/tomcat/util/buf/MessageBytes.java
index 422edbefc..c52faaeee 100644
--- a/java/org/apache/tomcat/util/buf/MessageBytes.java
+++ b/java/org/apache/tomcat/util/buf/MessageBytes.java
@@ -185,6 +185,7 @@ public final class MessageBytes implements Cloneable, Serializable {
 
     /** Compute the string value
      */
+    @Override
     public String toString() {
         if( hasStrValue ) return strValue;
         
@@ -400,6 +401,7 @@ public final class MessageBytes implements Cloneable, Serializable {
     
 
     // -------------------- Hash code  --------------------
+    @Override
     public  int hashCode() {
         if( hasHashCode ) return hashCode;
         int code = 0;
diff --git a/java/org/apache/tomcat/util/buf/StringCache.java b/java/org/apache/tomcat/util/buf/StringCache.java
index 7471c83ca..fd794e1dc 100644
--- a/java/org/apache/tomcat/util/buf/StringCache.java
+++ b/java/org/apache/tomcat/util/buf/StringCache.java
@@ -632,12 +632,15 @@ public class StringCache {
         public String enc = null;
         public String value = null;
 
+        @Override
         public String toString() {
             return value;
         }
+        @Override
         public int hashCode() {
             return value.hashCode();
         }
+        @Override
         public boolean equals(Object obj) {
             if (obj instanceof ByteEntry) {
                 return value.equals(((ByteEntry) obj).value);
@@ -656,12 +659,15 @@ public class StringCache {
         public char[] name = null;
         public String value = null;
 
+        @Override
         public String toString() {
             return value;
         }
+        @Override
         public int hashCode() {
             return value.hashCode();
         }
+        @Override
         public boolean equals(Object obj) {
             if (obj instanceof CharEntry) {
                 return value.equals(((CharEntry) obj).value);
diff --git a/java/org/apache/tomcat/util/digester/CallMethodRule.java b/java/org/apache/tomcat/util/digester/CallMethodRule.java
index 85ada3844..2e0469477 100644
--- a/java/org/apache/tomcat/util/digester/CallMethodRule.java
+++ b/java/org/apache/tomcat/util/digester/CallMethodRule.java
@@ -343,6 +343,7 @@ public class CallMethodRule extends Rule {
      * Set the associated digester.
      * If needed, this class loads the parameter classes from their names.
      */
+    @Override
     public void setDigester(Digester digester)
     {
         // call superclass
@@ -373,6 +374,7 @@ public class CallMethodRule extends Rule {
      *   the element name otherwise
      * @param attributes The attribute list for this element
      */
+    @Override
     public void begin(String namespace, String name, Attributes attributes)
             throws Exception {
 
@@ -398,6 +400,7 @@ public class CallMethodRule extends Rule {
      *   the element name otherwise
      * @param bodyText The body text of this element
      */
+    @Override
     public void body(String namespace, String name, String bodyText)
             throws Exception {
 
@@ -417,6 +420,7 @@ public class CallMethodRule extends Rule {
      * @param name the local name if the parser is namespace aware, or just 
      *   the element name otherwise
      */
+    @Override
     public void end(String namespace, String name) throws Exception {
 
         // Retrieve or construct the parameter values array
@@ -535,6 +539,7 @@ public class CallMethodRule extends Rule {
     /**
      * Clean up after parsing is complete.
      */
+    @Override
     public void finish() throws Exception {
 
         bodyText = null;
@@ -554,6 +559,7 @@ public class CallMethodRule extends Rule {
     /**
      * Render a printable version of this Rule.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("CallMethodRule[");
diff --git a/java/org/apache/tomcat/util/digester/CallParamRule.java b/java/org/apache/tomcat/util/digester/CallParamRule.java
index 89365c516..249a10c92 100644
--- a/java/org/apache/tomcat/util/digester/CallParamRule.java
+++ b/java/org/apache/tomcat/util/digester/CallParamRule.java
@@ -146,6 +146,7 @@ public class CallParamRule extends Rule {
      *   the element name otherwise
      * @param attributes The attribute list for this element
      */
+    @Override
     public void begin(String namespace, String name, Attributes attributes)
             throws Exception {
 
@@ -192,6 +193,7 @@ public class CallParamRule extends Rule {
      *   the element name otherwise
      * @param bodyText The body text of this element
      */
+    @Override
     public void body(String namespace, String name, String bodyText)
             throws Exception {
 
@@ -210,6 +212,7 @@ public class CallParamRule extends Rule {
     /**
      * Process any body texts now.
      */
+    @Override
     public void end(String namespace, String name) {
         if (bodyTextStack != null && !bodyTextStack.empty()) {
             // what we do now is push one parameter onto the top set of parameters
@@ -221,6 +224,7 @@ public class CallParamRule extends Rule {
     /**
      * Render a printable version of this Rule.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("CallParamRule[");
diff --git a/java/org/apache/tomcat/util/digester/Digester.java b/java/org/apache/tomcat/util/digester/Digester.java
index 56b18d25c..76e312b43 100644
--- a/java/org/apache/tomcat/util/digester/Digester.java
+++ b/java/org/apache/tomcat/util/digester/Digester.java
@@ -920,6 +920,7 @@ public class Digester extends DefaultHandler {
      *
      * @exception SAXException if a parsing error is to be reported
      */
+    @Override
     public void characters(char buffer[], int start, int length)
             throws SAXException {
 
@@ -937,6 +938,7 @@ public class Digester extends DefaultHandler {
      *
      * @exception SAXException if a parsing error is to be reported
      */
+    @Override
     public void endDocument() throws SAXException {
 
         if (saxLog.isDebugEnabled()) {
@@ -985,6 +987,7 @@ public class Digester extends DefaultHandler {
      *   empty string if qualified names are not available.
      * @exception SAXException if a parsing error is to be reported
      */
+    @Override
     public void endElement(String namespaceURI, String localName,
                            String qName) throws SAXException {
 
@@ -1081,6 +1084,7 @@ public class Digester extends DefaultHandler {
      *
      * @exception SAXException if a parsing error is to be reported
      */
+    @Override
     public void endPrefixMapping(String prefix) throws SAXException {
 
         if (saxLog.isDebugEnabled()) {
@@ -1113,6 +1117,7 @@ public class Digester extends DefaultHandler {
      *
      * @exception SAXException if a parsing error is to be reported
      */
+    @Override
     public void ignorableWhitespace(char buffer[], int start, int len)
             throws SAXException {
 
@@ -1134,6 +1139,7 @@ public class Digester extends DefaultHandler {
      *
      * @exception SAXException if a parsing error is to be reported
      */
+    @Override
     public void processingInstruction(String target, String data)
             throws SAXException {
 
@@ -1162,6 +1168,7 @@ public class Digester extends DefaultHandler {
      *
      * @param locator The new locator
      */
+    @Override
     public void setDocumentLocator(Locator locator) {
 
         if (saxLog.isDebugEnabled()) {
@@ -1180,6 +1187,7 @@ public class Digester extends DefaultHandler {
      *
      * @exception SAXException if a parsing error is to be reported
      */
+    @Override
     public void skippedEntity(String name) throws SAXException {
 
         if (saxLog.isDebugEnabled()) {
@@ -1196,6 +1204,7 @@ public class Digester extends DefaultHandler {
      *
      * @exception SAXException if a parsing error is to be reported
      */
+    @Override
     public void startDocument() throws SAXException {
 
         if (saxLog.isDebugEnabled()) {
@@ -1222,6 +1231,7 @@ public class Digester extends DefaultHandler {
      *   no attributes, it shall be an empty Attributes object. 
      * @exception SAXException if a parsing error is to be reported
      */
+    @Override
     public void startElement(String namespaceURI, String localName,
                              String qName, Attributes list)
             throws SAXException {
@@ -1296,6 +1306,7 @@ public class Digester extends DefaultHandler {
      *
      * @exception SAXException if a parsing error is to be reported
      */
+    @Override
     public void startPrefixMapping(String prefix, String namespaceURI)
             throws SAXException {
 
@@ -1324,6 +1335,7 @@ public class Digester extends DefaultHandler {
      * @param publicId The public identifier (if any)
      * @param systemId The system identifier (if any)
      */
+    @Override
     public void notationDecl(String name, String publicId, String systemId) {
 
         if (saxLog.isDebugEnabled()) {
@@ -1342,6 +1354,7 @@ public class Digester extends DefaultHandler {
      * @param systemId The system identifier (if any)
      * @param notation The name of the associated notation
      */
+    @Override
     public void unparsedEntityDecl(String name, String publicId,
                                    String systemId, String notation) {
 
@@ -1383,6 +1396,7 @@ public class Digester extends DefaultHandler {
      * @exception SAXException if a parsing exception occurs
      * 
      */
+    @Override
     public InputSource resolveEntity(String publicId, String systemId)
             throws SAXException {     
                 
@@ -1440,6 +1454,7 @@ public class Digester extends DefaultHandler {
      *
      * @exception SAXException if a parsing exception occurs
      */
+    @Override
     public void error(SAXParseException exception) throws SAXException {
 
         log.error("Parse Error at line " + exception.getLineNumber() +
@@ -1460,6 +1475,7 @@ public class Digester extends DefaultHandler {
      *
      * @exception SAXException if a parsing exception occurs
      */
+    @Override
     public void fatalError(SAXParseException exception) throws SAXException {
 
         log.error("Parse Fatal Error at line " + exception.getLineNumber() +
@@ -1480,6 +1496,7 @@ public class Digester extends DefaultHandler {
      *
      * @exception SAXException if a parsing exception occurs
      */
+    @Override
     public void warning(SAXParseException exception) throws SAXException {
          if (errorHandler != null) {
             log.warn("Parse Warning Error at line " + exception.getLineNumber() +
diff --git a/java/org/apache/tomcat/util/digester/FactoryCreateRule.java b/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
index bf7e2dc38..a9078eb33 100644
--- a/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
+++ b/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
@@ -257,6 +257,7 @@ public class FactoryCreateRule extends Rule {
      *
      * @param attributes The attribute list of this element
      */
+    @Override
     public void begin(String namespace, String name, Attributes attributes) throws Exception {
         
         if (ignoreCreateExceptions) {
@@ -302,6 +303,7 @@ public class FactoryCreateRule extends Rule {
     /**
      * Process the end of this element.
      */
+    @Override
     public void end(String namespace, String name) throws Exception {
         
         // check if object was created 
@@ -333,6 +335,7 @@ public class FactoryCreateRule extends Rule {
     /**
      * Clean up after parsing is complete.
      */
+    @Override
     public void finish() throws Exception {
 
         if (attributeName != null) {
@@ -345,6 +348,7 @@ public class FactoryCreateRule extends Rule {
     /**
      * Render a printable version of this Rule.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("FactoryCreateRule[");
diff --git a/java/org/apache/tomcat/util/digester/NodeCreateRule.java b/java/org/apache/tomcat/util/digester/NodeCreateRule.java
index 446557641..17ee023ea 100644
--- a/java/org/apache/tomcat/util/digester/NodeCreateRule.java
+++ b/java/org/apache/tomcat/util/digester/NodeCreateRule.java
@@ -163,6 +163,7 @@ public class NodeCreateRule extends Rule {
          * @param length the number of characters to read from the array
          * @throws SAXException if the DOM implementation throws an exception
          */
+        @Override
         public void characters(char[] ch, int start, int length)
             throws SAXException {
 
@@ -186,6 +187,7 @@ public class NodeCreateRule extends Rule {
          * @param qName the qualified (prefixed) name
          * @throws SAXException if the DOM implementation throws an exception
          */
+        @Override
         public void endElement(String namespaceURI, String localName,
                                String qName)
             throws SAXException {
@@ -217,6 +219,7 @@ public class NodeCreateRule extends Rule {
          *   supplied
          * @throws SAXException if the DOM implementation throws an exception
          */
+        @Override
         public void processingInstruction(String target, String data)
             throws SAXException {
             
@@ -239,6 +242,7 @@ public class NodeCreateRule extends Rule {
          * @param atts the list of attributes
          * @throws SAXException if the DOM implementation throws an exception
          */
+        @Override
         public void startElement(String namespaceURI, String localName,
                                  String qName, Attributes atts)
             throws SAXException {
@@ -384,6 +388,7 @@ public class NodeCreateRule extends Rule {
      * @param attributes The attribute list of this element
      * @throws Exception indicates a JAXP configuration problem
      */
+    @Override
     public void begin(String namespaceURI, String name, Attributes attributes)
         throws Exception {
 
@@ -425,6 +430,7 @@ public class NodeCreateRule extends Rule {
      * @param name the local name if the parser is namespace aware, or just 
      *   the element name otherwise
      */
+    @Override
     public void end(String namespace, String name) throws Exception {
 
         digester.pop();
diff --git a/java/org/apache/tomcat/util/digester/ObjectCreateRule.java b/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
index e746584f1..834520b60 100644
--- a/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
+++ b/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
@@ -119,6 +119,7 @@ public class ObjectCreateRule extends Rule {
      *   the element name otherwise
      * @param attributes The attribute list for this element
      */
+    @Override
     public void begin(String namespace, String name, Attributes attributes)
             throws Exception {
 
@@ -152,6 +153,7 @@ public class ObjectCreateRule extends Rule {
      * @param name the local name if the parser is namespace aware, or just 
      *   the element name otherwise
      */
+    @Override
     public void end(String namespace, String name) throws Exception {
 
         Object top = digester.pop();
@@ -166,6 +168,7 @@ public class ObjectCreateRule extends Rule {
     /**
      * Render a printable version of this Rule.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("ObjectCreateRule[");
diff --git a/java/org/apache/tomcat/util/digester/ObjectParamRule.java b/java/org/apache/tomcat/util/digester/ObjectParamRule.java
index 7b1d6a41f..1c43d54a8 100644
--- a/java/org/apache/tomcat/util/digester/ObjectParamRule.java
+++ b/java/org/apache/tomcat/util/digester/ObjectParamRule.java
@@ -91,6 +91,7 @@ public class ObjectParamRule extends Rule {
      *
      * @param attributes The attribute list for this element
      */
+    @Override
     public void begin(String namespace, String name,
                       Attributes attributes) throws Exception {
         Object anAttribute = null;
@@ -111,6 +112,7 @@ public class ObjectParamRule extends Rule {
     /**
      * Render a printable version of this Rule.
      */
+    @Override
     public String toString() {
         StringBuilder sb = new StringBuilder("ObjectParamRule[");
         sb.append("paramIndex=");
diff --git a/java/org/apache/tomcat/util/digester/PathCallParamRule.java b/java/org/apache/tomcat/util/digester/PathCallParamRule.java
index 673f37dc9..8e2503173 100644
--- a/java/org/apache/tomcat/util/digester/PathCallParamRule.java
+++ b/java/org/apache/tomcat/util/digester/PathCallParamRule.java
@@ -68,6 +68,7 @@ public class PathCallParamRule extends Rule {
      * @param attributes The attribute list for this element
 
      */
+    @Override
     public void begin(String namespace, String name, Attributes attributes) throws Exception {
 
         String param = getDigester().getMatch();
@@ -82,6 +83,7 @@ public class PathCallParamRule extends Rule {
     /**
      * Render a printable version of this Rule.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("PathCallParamRule[");
diff --git a/java/org/apache/tomcat/util/digester/SetNextRule.java b/java/org/apache/tomcat/util/digester/SetNextRule.java
index 63170af65..737cedbfc 100644
--- a/java/org/apache/tomcat/util/digester/SetNextRule.java
+++ b/java/org/apache/tomcat/util/digester/SetNextRule.java
@@ -180,6 +180,7 @@ public class SetNextRule extends Rule {
      * @param name the local name if the parser is namespace aware, or just 
      *   the element name otherwise
      */
+    @Override
     public void end(String namespace, String name) throws Exception {
 
         // Identify the objects to be used
@@ -207,6 +208,7 @@ public class SetNextRule extends Rule {
     /**
      * Render a printable version of this Rule.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("SetNextRule[");
diff --git a/java/org/apache/tomcat/util/digester/SetPropertiesRule.java b/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
index 2fdacc38f..941808122 100644
--- a/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
+++ b/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
@@ -158,6 +158,7 @@ public class SetPropertiesRule extends Rule {
      *   the element name otherwise
      * @param attributes The attribute list for this element
      */
+    @Override
     public void begin(String namespace, String theName, Attributes attributes)
             throws Exception {
         
@@ -263,6 +264,7 @@ public class SetPropertiesRule extends Rule {
     /**
      * Render a printable version of this Rule.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("SetPropertiesRule[");
diff --git a/java/org/apache/tomcat/util/digester/SetPropertyRule.java b/java/org/apache/tomcat/util/digester/SetPropertyRule.java
index f6d7e594e..2ae8f7bf1 100644
--- a/java/org/apache/tomcat/util/digester/SetPropertyRule.java
+++ b/java/org/apache/tomcat/util/digester/SetPropertyRule.java
@@ -102,6 +102,7 @@ public class SetPropertyRule extends Rule {
      * @exception NoSuchMethodException if the bean does not
      *  have a writeable property of the specified name
      */
+    @Override
     public void begin(String namespace, String theName, Attributes attributes)
             throws Exception {
 
@@ -146,6 +147,7 @@ public class SetPropertyRule extends Rule {
     /**
      * Render a printable version of this Rule.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("SetPropertyRule[");
diff --git a/java/org/apache/tomcat/util/digester/SetRootRule.java b/java/org/apache/tomcat/util/digester/SetRootRule.java
index dd4d1a001..da4b89fb8 100644
--- a/java/org/apache/tomcat/util/digester/SetRootRule.java
+++ b/java/org/apache/tomcat/util/digester/SetRootRule.java
@@ -181,6 +181,7 @@ public class SetRootRule extends Rule {
      * @param name the local name if the parser is namespace aware, or just 
      *   the element name otherwise
      */
+    @Override
     public void end(String namespace, String name) throws Exception {
 
         // Identify the objects to be used
@@ -208,6 +209,7 @@ public class SetRootRule extends Rule {
     /**
      * Render a printable version of this Rule.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("SetRootRule[");
diff --git a/java/org/apache/tomcat/util/digester/SetTopRule.java b/java/org/apache/tomcat/util/digester/SetTopRule.java
index 9632d5392..ef4175cc8 100644
--- a/java/org/apache/tomcat/util/digester/SetTopRule.java
+++ b/java/org/apache/tomcat/util/digester/SetTopRule.java
@@ -180,6 +180,7 @@ public class SetTopRule extends Rule {
      * @param name the local name if the parser is namespace aware, or just 
      *   the element name otherwise
      */
+    @Override
     public void end(String namespace, String name) throws Exception {
 
         // Identify the objects to be used
@@ -208,6 +209,7 @@ public class SetTopRule extends Rule {
     /**
      * Render a printable version of this Rule.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("SetTopRule[");
diff --git a/java/org/apache/tomcat/util/http/Cookies.java b/java/org/apache/tomcat/util/http/Cookies.java
index 12ef857bb..7efddbe57 100644
--- a/java/org/apache/tomcat/util/http/Cookies.java
+++ b/java/org/apache/tomcat/util/http/Cookies.java
@@ -161,6 +161,7 @@ public final class Cookies { // extends MultiMap {
     /**
      * EXPENSIVE!!!  only for debugging.
      */
+    @Override
     public String toString() {
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
diff --git a/java/org/apache/tomcat/util/http/MimeHeaders.java b/java/org/apache/tomcat/util/http/MimeHeaders.java
index 4b45f354c..d4031cef3 100644
--- a/java/org/apache/tomcat/util/http/MimeHeaders.java
+++ b/java/org/apache/tomcat/util/http/MimeHeaders.java
@@ -135,6 +135,7 @@ public class MimeHeaders {
     /**
      * EXPENSIVE!!!  only for debugging.
      */
+    @Override
     public String toString() {
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
diff --git a/java/org/apache/tomcat/util/http/Parameters.java b/java/org/apache/tomcat/util/http/Parameters.java
index d67ac893f..37bf2f36b 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -80,6 +80,7 @@ public final class Parameters extends MultiMap {
         }
     }
 
+    @Override
     public void recycle() {
         super.recycle();
         paramHashStringArray.clear();
diff --git a/java/org/apache/tomcat/util/http/ServerCookie.java b/java/org/apache/tomcat/util/http/ServerCookie.java
index 33e205920..6e3cb6cae 100644
--- a/java/org/apache/tomcat/util/http/ServerCookie.java
+++ b/java/org/apache/tomcat/util/http/ServerCookie.java
@@ -59,6 +59,7 @@ public class ServerCookie implements Serializable {
         "EEE, dd-MMM-yyyy HH:mm:ss z";
     private static final ThreadLocal<DateFormat> OLD_COOKIE_FORMAT =
         new ThreadLocal<DateFormat>() {
+        @Override
         protected DateFormat initialValue() {
             DateFormat df =
                 new SimpleDateFormat(OLD_COOKIE_PATTERN, Locale.US);
@@ -186,6 +187,7 @@ public class ServerCookie implements Serializable {
 
     // -------------------- utils --------------------
 
+    @Override
     public String toString() {
         return "Cookie " + getName() + "=" + getValue() + " ; "
             + getVersion() + " " + getPath() + " " + getDomain();
diff --git a/java/org/apache/tomcat/util/http/fileupload/DefaultFileItem.java b/java/org/apache/tomcat/util/http/fileupload/DefaultFileItem.java
index 8d9087c23..65218dd32 100644
--- a/java/org/apache/tomcat/util/http/fileupload/DefaultFileItem.java
+++ b/java/org/apache/tomcat/util/http/fileupload/DefaultFileItem.java
@@ -545,6 +545,7 @@ public class DefaultFileItem
     /**
      * Removes the file contents from the temporary storage.
      */
+    @Override
     protected void finalize()
     {
         File outputFile = dfos.getFile();
diff --git a/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java b/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
index 1f26a8427..8c1e4c0dd 100644
--- a/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
+++ b/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java
@@ -100,6 +100,7 @@ public class DeferredFileOutputStream
      *
      * @exception IOException if an error occurs.
      */
+    @Override
     protected OutputStream getStream() throws IOException
     {
         return currentOutputStream;
@@ -114,6 +115,7 @@ public class DeferredFileOutputStream
      *
      * @exception IOException if an error occurs.
      */
+    @Override
     protected void thresholdReached() throws IOException
     {
         byte[] data = memoryOutputStream.toByteArray();
diff --git a/java/org/apache/tomcat/util/http/fileupload/DiskFileUpload.java b/java/org/apache/tomcat/util/http/fileupload/DiskFileUpload.java
index 43cdb1945..a514e0f78 100644
--- a/java/org/apache/tomcat/util/http/fileupload/DiskFileUpload.java
+++ b/java/org/apache/tomcat/util/http/fileupload/DiskFileUpload.java
@@ -97,6 +97,7 @@ public class DiskFileUpload
      *
      * @return The factory class for new file items.
      */
+    @Override
     public FileItemFactory getFileItemFactory()
     {
         return fileItemFactory;
@@ -110,6 +111,7 @@ public class DiskFileUpload
      *
      * @param factory The factory class for new file items.
      */
+    @Override
     public void setFileItemFactory(FileItemFactory factory)
     {
         this.fileItemFactory = (DefaultFileItemFactory) factory;
diff --git a/java/org/apache/tomcat/util/http/fileupload/FileUpload.java b/java/org/apache/tomcat/util/http/fileupload/FileUpload.java
index 5ed194416..a417cb31d 100644
--- a/java/org/apache/tomcat/util/http/fileupload/FileUpload.java
+++ b/java/org/apache/tomcat/util/http/fileupload/FileUpload.java
@@ -91,6 +91,7 @@ public class FileUpload
      *
      * @return The factory class for new file items.
      */
+    @Override
     public FileItemFactory getFileItemFactory()
     {
         return fileItemFactory;
@@ -102,6 +103,7 @@ public class FileUpload
      *
      * @param factory The factory class for new file items.
      */
+    @Override
     public void setFileItemFactory(FileItemFactory factory)
     {
         this.fileItemFactory = factory;
diff --git a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
index 40c6c5d2c..446eef83d 100644
--- a/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
+++ b/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
@@ -757,6 +757,7 @@ public class MultipartStream
      *
      * @return The string representation of this object.
      */
+    @Override
     public String toString()
     {
         StringBuilder sbTemp = new StringBuilder();
diff --git a/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java b/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java
index 9e1d49edb..54271fa91 100644
--- a/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java
+++ b/java/org/apache/tomcat/util/http/fileupload/ThresholdingOutputStream.java
@@ -90,6 +90,7 @@ public abstract class ThresholdingOutputStream
      *
      * @exception IOException if an error occurs.
      */
+    @Override
     public void write(int b) throws IOException
     {
         checkThreshold(1);
@@ -106,6 +107,7 @@ public abstract class ThresholdingOutputStream
      *
      * @exception IOException if an error occurs.
      */
+    @Override
     public void write(byte b[]) throws IOException
     {
         checkThreshold(b.length);
@@ -124,6 +126,7 @@ public abstract class ThresholdingOutputStream
      *
      * @exception IOException if an error occurs.
      */
+    @Override
     public void write(byte b[], int off, int len) throws IOException
     {
         checkThreshold(len);
@@ -138,6 +141,7 @@ public abstract class ThresholdingOutputStream
      *
      * @exception IOException if an error occurs.
      */
+    @Override
     public void flush() throws IOException
     {
         getStream().flush();
@@ -150,6 +154,7 @@ public abstract class ThresholdingOutputStream
      *
      * @exception IOException if an error occurs.
      */
+    @Override
     public void close() throws IOException
     {
         try
diff --git a/java/org/apache/tomcat/util/log/SystemLogHandler.java b/java/org/apache/tomcat/util/log/SystemLogHandler.java
index 01ad98adb..1549c526a 100644
--- a/java/org/apache/tomcat/util/log/SystemLogHandler.java
+++ b/java/org/apache/tomcat/util/log/SystemLogHandler.java
@@ -138,107 +138,133 @@ public class SystemLogHandler extends PrintStream {
     // ---------------------------------------------------- PrintStream Methods
 
 
+    @Override
     public void flush() {
         findStream().flush();
     }
 
+    @Override
     public void close() {
         findStream().close();
     }
 
+    @Override
     public boolean checkError() {
         return findStream().checkError();
     }
 
+    @Override
     protected void setError() {
         //findStream().setError();
     }
 
+    @Override
     public void write(int b) {
         findStream().write(b);
     }
 
+    @Override
     public void write(byte[] b)
         throws IOException {
         findStream().write(b);
     }
 
+    @Override
     public void write(byte[] buf, int off, int len) {
         findStream().write(buf, off, len);
     }
 
+    @Override
     public void print(boolean b) {
         findStream().print(b);
     }
 
+    @Override
     public void print(char c) {
         findStream().print(c);
     }
 
+    @Override
     public void print(int i) {
         findStream().print(i);
     }
 
+    @Override
     public void print(long l) {
         findStream().print(l);
     }
 
+    @Override
     public void print(float f) {
         findStream().print(f);
     }
 
+    @Override
     public void print(double d) {
         findStream().print(d);
     }
 
+    @Override
     public void print(char[] s) {
         findStream().print(s);
     }
 
+    @Override
     public void print(String s) {
         findStream().print(s);
     }
 
+    @Override
     public void print(Object obj) {
         findStream().print(obj);
     }
 
+    @Override
     public void println() {
         findStream().println();
     }
 
+    @Override
     public void println(boolean x) {
         findStream().println(x);
     }
 
+    @Override
     public void println(char x) {
         findStream().println(x);
     }
 
+    @Override
     public void println(int x) {
         findStream().println(x);
     }
 
+    @Override
     public void println(long x) {
         findStream().println(x);
     }
 
+    @Override
     public void println(float x) {
         findStream().println(x);
     }
 
+    @Override
     public void println(double x) {
         findStream().println(x);
     }
 
+    @Override
     public void println(char[] x) {
         findStream().println(x);
     }
 
+    @Override
     public void println(String x) {
         findStream().println(x);
     }
 
+    @Override
     public void println(Object x) {
         findStream().println(x);
     }
diff --git a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
index d986edac1..aef3bb0ea 100644
--- a/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
+++ b/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
@@ -444,6 +444,7 @@ public class BaseModelMBean implements DynamicMBean, MBeanRegistration, ModelMBe
 //        }
     }
 
+    @Override
     public String toString() {
         if( resource==null ) 
             return "BaseModelMbean[" + resourceType + "]";
@@ -1149,7 +1150,8 @@ public class BaseModelMBean implements DynamicMBean, MBeanRegistration, ModelMBe
 	    this.signature = signature;
 	}
 
-	public boolean equals(Object other) {
+	@Override
+    public boolean equals(Object other) {
 	    if(!(other instanceof MethodKey)) {
 		return false;
 	    }
@@ -1168,7 +1170,8 @@ public class BaseModelMBean implements DynamicMBean, MBeanRegistration, ModelMBe
 	    return true;
 	}
 
-	public int hashCode() {
+	@Override
+    public int hashCode() {
 	    return name.hashCode();
 	}
     }
diff --git a/java/org/apache/tomcat/util/modeler/ManagedBean.java b/java/org/apache/tomcat/util/modeler/ManagedBean.java
index cf71c4ac2..5e11a9233 100644
--- a/java/org/apache/tomcat/util/modeler/ManagedBean.java
+++ b/java/org/apache/tomcat/util/modeler/ManagedBean.java
@@ -460,6 +460,7 @@ public class ManagedBean implements java.io.Serializable
     /**
      * Return a string representation of this managed bean.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("ManagedBean[");
diff --git a/java/org/apache/tomcat/util/modeler/NotificationInfo.java b/java/org/apache/tomcat/util/modeler/NotificationInfo.java
index e6cd0c86c..8d02338f3 100644
--- a/java/org/apache/tomcat/util/modeler/NotificationInfo.java
+++ b/java/org/apache/tomcat/util/modeler/NotificationInfo.java
@@ -53,6 +53,7 @@ public class NotificationInfo extends FeatureInfo implements Serializable {
      *
      * @param description The new description
      */
+    @Override
     public void setDescription(String description) {
         super.setDescription(description);
         this.info = null;
@@ -64,6 +65,7 @@ public class NotificationInfo extends FeatureInfo implements Serializable {
      *
      * @param name The new name
      */
+    @Override
     public void setName(String name) {
         super.setName(name);
         this.info = null;
@@ -123,6 +125,7 @@ public class NotificationInfo extends FeatureInfo implements Serializable {
     /**
      * Return a string representation of this notification descriptor.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("NotificationInfo[");
diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
index 6429e76ae..d183175bb 100644
--- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
+++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDOMSource.java
@@ -67,6 +67,7 @@ public class MbeansDescriptorsDOMSource extends ModelerSource
         this.source=source;
     }
 
+    @Override
     public List<ObjectName> loadDescriptors( Registry registry, String location,
                                  String type, Object source)
             throws Exception
diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
index 3c0221ecb..be8a134bb 100644
--- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
+++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
@@ -204,6 +204,7 @@ public class MbeansDescriptorsDigesterSource extends ModelerSource
         this.source=source;
     }
 
+    @Override
     public List<ObjectName> loadDescriptors( Registry registry, String location,
             String type, Object source) throws Exception {
         setRegistry(registry);
diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
index b1813ca05..048ab7774 100644
--- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
+++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
@@ -66,6 +66,7 @@ public class MbeansDescriptorsIntrospectionSource extends ModelerSource
         this.source=source;
     }
 
+    @Override
     public List<ObjectName> loadDescriptors( Registry registry, String location,
             String type, Object source) throws Exception {
         setRegistry(registry);
diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
index 10a73f834..33eefd721 100644
--- a/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
+++ b/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsSerSource.java
@@ -59,6 +59,7 @@ public class MbeansDescriptorsSerSource extends ModelerSource
         this.source=source;
     }
 
+    @Override
     public List<ObjectName> loadDescriptors( Registry registry, String location,
             String type, Object source) throws Exception {
         setRegistry(registry);
diff --git a/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java b/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
index cd3701d78..a0d91d052 100644
--- a/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
+++ b/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
@@ -103,6 +103,7 @@ public class MbeansSource extends ModelerSource implements MbeansSourceMBean
         return mbeans;
     }
 
+    @Override
     public List<ObjectName> loadDescriptors(Registry registry, String location,
             String type, Object source) throws Exception {
         setRegistry(registry);
@@ -267,6 +268,7 @@ public class MbeansSource extends ModelerSource implements MbeansSourceMBean
         }
     }
     
+    @Override
     public void updateField( ObjectName oname, String name, 
                              Object value )
     {
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 065a4c29e..fbad6c9ec 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -100,7 +100,9 @@ public class AprEndpoint extends AbstractEndpoint {
      * Priority of the acceptor and poller threads.
      */
     protected int threadPriority = Thread.NORM_PRIORITY;
+    @Override
     public void setThreadPriority(int threadPriority) { this.threadPriority = threadPriority; }
+    @Override
     public int getThreadPriority() { return threadPriority; }
 
 
diff --git a/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java b/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
index c122990d3..f29da5e20 100644
--- a/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
+++ b/java/org/apache/tomcat/util/net/DefaultServerSocketFactory.java
@@ -40,27 +40,32 @@ class DefaultServerSocketFactory extends ServerSocketFactory {
         /* NOTHING */
     }
 
+    @Override
     public ServerSocket createSocket (int port)
     throws IOException {
         return  new ServerSocket (port);
     }
 
+    @Override
     public ServerSocket createSocket (int port, int backlog)
     throws IOException {
         return new ServerSocket (port, backlog);
     }
 
+    @Override
     public ServerSocket createSocket (int port, int backlog,
         InetAddress ifAddress)
     throws IOException {
         return new ServerSocket (port, backlog, ifAddress);
     }
  
+    @Override
     public Socket acceptSocket(ServerSocket socket)
  	throws IOException {
  	return socket.accept();
     }
  
+    @Override
     public void handshake(Socket sock)
  	throws IOException {
         // NOOP
diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java
index f7a0431b5..fdbc2ddaa 100644
--- a/java/org/apache/tomcat/util/net/JIoEndpoint.java
+++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java
@@ -64,6 +64,7 @@ public class JIoEndpoint extends AbstractEndpoint {
     /**
      * Generic properties - currently only socket.XXX properties
      */
+    @Override
     public boolean setProperty(String name, String value) {
         final String socketName = "socket.";
         try {
@@ -89,7 +90,9 @@ public class JIoEndpoint extends AbstractEndpoint {
      * Priority of the acceptor and poller threads.
      */
     protected int threadPriority = Thread.NORM_PRIORITY;
+    @Override
     public void setThreadPriority(int threadPriority) { this.threadPriority = threadPriority; }
+    @Override
     public int getThreadPriority() { return threadPriority; }
 
     
diff --git a/java/org/apache/tomcat/util/net/NioChannel.java b/java/org/apache/tomcat/util/net/NioChannel.java
index 92b90edc3..298feed56 100644
--- a/java/org/apache/tomcat/util/net/NioChannel.java
+++ b/java/org/apache/tomcat/util/net/NioChannel.java
@@ -191,6 +191,7 @@ public class NioChannel implements ByteChannel{
         this.sc = IOChannel;
     }
 
+    @Override
     public String toString() {
         return super.toString()+":"+this.sc.toString();
     }
diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 356100f12..21e10d99c 100644
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -134,6 +134,7 @@ public class NioEndpoint extends AbstractEndpoint {
      */
     protected ConcurrentLinkedQueue<SocketProcessor> processorCache = new ConcurrentLinkedQueue<SocketProcessor>() {
         protected AtomicInteger size = new AtomicInteger(0);
+        @Override
         public boolean offer(SocketProcessor sc) {
             sc.reset(null,null);
             boolean offer = socketProperties.getProcessorCache()==-1?true:size.get()<socketProperties.getProcessorCache();
@@ -148,6 +149,7 @@ public class NioEndpoint extends AbstractEndpoint {
             else return false;
         }
         
+        @Override
         public SocketProcessor poll() {
             SocketProcessor result = super.poll();
             if ( result != null ) {
@@ -156,6 +158,7 @@ public class NioEndpoint extends AbstractEndpoint {
             return result;
         }
         
+        @Override
         public void clear() {
             super.clear();
             size.set(0);
@@ -168,6 +171,7 @@ public class NioEndpoint extends AbstractEndpoint {
      */
     protected ConcurrentLinkedQueue<KeyAttachment> keyCache = new ConcurrentLinkedQueue<KeyAttachment>() {
         protected AtomicInteger size = new AtomicInteger(0);
+        @Override
         public boolean offer(KeyAttachment ka) {
             ka.reset();
             boolean offer = socketProperties.getKeyCache()==-1?true:size.get()<socketProperties.getKeyCache();
@@ -182,6 +186,7 @@ public class NioEndpoint extends AbstractEndpoint {
             else return false;
         }
 
+        @Override
         public KeyAttachment poll() {
             KeyAttachment result = super.poll();
             if ( result != null ) {
@@ -190,6 +195,7 @@ public class NioEndpoint extends AbstractEndpoint {
             return result;
         }
 
+        @Override
         public void clear() {
             super.clear();
             size.set(0);
@@ -202,6 +208,7 @@ public class NioEndpoint extends AbstractEndpoint {
      */
     protected ConcurrentLinkedQueue<PollerEvent> eventCache = new ConcurrentLinkedQueue<PollerEvent>() {
         protected AtomicInteger size = new AtomicInteger(0);
+        @Override
         public boolean offer(PollerEvent pe) {
             pe.reset();
             boolean offer = socketProperties.getEventCache()==-1?true:size.get()<socketProperties.getEventCache();
@@ -216,6 +223,7 @@ public class NioEndpoint extends AbstractEndpoint {
             else return false;
         }
 
+        @Override
         public PollerEvent poll() {
             PollerEvent result = super.poll();
             if ( result != null ) {
@@ -224,6 +232,7 @@ public class NioEndpoint extends AbstractEndpoint {
             return result;
         }
 
+        @Override
         public void clear() {
             super.clear();
             size.set(0);
@@ -237,6 +246,7 @@ public class NioEndpoint extends AbstractEndpoint {
     protected ConcurrentLinkedQueue<NioChannel> nioChannels = new ConcurrentLinkedQueue<NioChannel>() {
         protected AtomicInteger size = new AtomicInteger(0);
         protected AtomicInteger bytes = new AtomicInteger(0);
+        @Override
         public boolean offer(NioChannel socket) {
             boolean offer = socketProperties.getBufferPool()==-1?true:size.get()<socketProperties.getBufferPool();
             offer = offer && (socketProperties.getBufferPoolSize()==-1?true:(bytes.get()+socket.getBufferSize())<socketProperties.getBufferPoolSize());
@@ -252,6 +262,7 @@ public class NioEndpoint extends AbstractEndpoint {
             else return false;
         }
         
+        @Override
         public NioChannel poll() {
             NioChannel result = super.poll();
             if ( result != null ) {
@@ -261,6 +272,7 @@ public class NioEndpoint extends AbstractEndpoint {
             return result;
         }
         
+        @Override
         public void clear() {
             super.clear();
             size.set(0);
@@ -462,7 +474,9 @@ public class NioEndpoint extends AbstractEndpoint {
      * SSL engine.
      */
     protected boolean SSLEnabled = false;
+    @Override
     public boolean isSSLEnabled() { return SSLEnabled;}
+    @Override
     public void setSSLEnabled(boolean SSLEnabled) {this.SSLEnabled = SSLEnabled;}
 
     protected boolean secure = false;
@@ -547,6 +561,7 @@ public class NioEndpoint extends AbstractEndpoint {
      *
      * @return true if the endpoint is running, false otherwise
      */
+    @Override
     public boolean isRunning() {
         return running;
     }
@@ -557,6 +572,7 @@ public class NioEndpoint extends AbstractEndpoint {
      *
      * @return true if the endpoint is paused, false otherwise
      */
+    @Override
     public boolean isPaused() {
         return paused;
     }
@@ -1013,6 +1029,7 @@ public class NioEndpoint extends AbstractEndpoint {
             }//end if
         }//run
         
+        @Override
         public String toString() {
             return super.toString()+"[intOps="+this.interestOps+"]";
         }
diff --git a/java/org/apache/tomcat/util/net/SecureNioChannel.java b/java/org/apache/tomcat/util/net/SecureNioChannel.java
index e32e48bd1..19717466f 100644
--- a/java/org/apache/tomcat/util/net/SecureNioChannel.java
+++ b/java/org/apache/tomcat/util/net/SecureNioChannel.java
@@ -73,6 +73,7 @@ public class SecureNioChannel extends NioChannel  {
         this.sslEngine = engine;
         reset();
     }
+    @Override
     public void reset() throws IOException {
         super.reset();
         netOutBuffer.position(0);
@@ -87,6 +88,7 @@ public class SecureNioChannel extends NioChannel  {
         initHandshakeStatus = sslEngine.getHandshakeStatus();
     }
     
+    @Override
     public int getBufferSize() {
         int size = super.getBufferSize();
         size += netInBuffer!=null?netInBuffer.capacity():0;
@@ -103,6 +105,7 @@ public class SecureNioChannel extends NioChannel  {
      * been flushed out and is empty
      * @return boolean
      */
+    @Override
     public boolean flush(boolean block, Selector s, long timeout,MutableInteger lastWrite) throws IOException {
         if (!block) {
             flush(netOutBuffer);
@@ -139,6 +142,7 @@ public class SecureNioChannel extends NioChannel  {
      * @return int - 0 if hand shake is complete, otherwise it returns a SelectionKey interestOps value
      * @throws IOException
      */
+    @Override
     public int handshake(boolean read, boolean write) throws IOException {
         if ( initHandshakeComplete ) return 0; //we have done our initial handshake
         
@@ -287,6 +291,7 @@ public class SecureNioChannel extends NioChannel  {
      * @throws IOException if there is data on the outgoing network buffer and we are unable to flush it
      * @todo Implement this java.io.Closeable method
      */
+    @Override
     public void close() throws IOException {
         if (closing) return;
         closing = true;
@@ -317,6 +322,7 @@ public class SecureNioChannel extends NioChannel  {
      * @param force boolean
      * @throws IOException
      */
+    @Override
     public void close(boolean force) throws IOException {
         try {
             close();
@@ -338,6 +344,7 @@ public class SecureNioChannel extends NioChannel  {
      * @throws IllegalArgumentException if the destination buffer is different than bufHandler.getReadBuffer()
      * @todo Implement this java.nio.channels.ReadableByteChannel method
      */
+    @Override
     public int read(ByteBuffer dst) throws IOException {
         //if we want to take advantage of the expand function, make sure we only use the ApplicationBufferHandler's buffers
         if ( dst != bufHandler.getReadBuffer() ) throw new IllegalArgumentException("You can only read using the application read buffer provided by the handler.");
@@ -392,6 +399,7 @@ public class SecureNioChannel extends NioChannel  {
      * @throws IOException If some other I/O error occurs
      * @todo Implement this java.nio.channels.WritableByteChannel method
      */
+    @Override
     public int write(ByteBuffer src) throws IOException {
         if ( src == this.netOutBuffer ) {
             //we can get here through a recursive call
@@ -458,14 +466,17 @@ public class SecureNioChannel extends NioChannel  {
         public ByteBuffer getWriteBuffer();
     }
 
+    @Override
     public ApplicationBufferHandler getBufHandler() {
         return bufHandler;
     }
 
+    @Override
     public boolean isInitHandshakeComplete() {
         return initHandshakeComplete;
     }
 
+    @Override
     public boolean isClosing() {
         return closing;
     }
@@ -482,6 +493,7 @@ public class SecureNioChannel extends NioChannel  {
         this.bufHandler = bufHandler;
     }
     
+    @Override
     public SocketChannel getIOChannel() {
         return sc;
     }
diff --git a/java/org/apache/tomcat/util/net/URL.java b/java/org/apache/tomcat/util/net/URL.java
index bde9420f6..3dde8cfeb 100644
--- a/java/org/apache/tomcat/util/net/URL.java
+++ b/java/org/apache/tomcat/util/net/URL.java
@@ -302,6 +302,7 @@ public final class URL implements Serializable {
      *
      * @param obj The URL to compare against
      */
+    @Override
     public boolean equals(Object obj) {
 
         if (obj == null)
@@ -561,6 +562,7 @@ public final class URL implements Serializable {
     /**
      * Return a string representation of this object.
      */
+    @Override
     public String toString() {
 
         StringBuilder sb = new StringBuilder("URL[");
diff --git a/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java b/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
index e0598393f..b8687b3f3 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
@@ -47,15 +47,18 @@ public class JSSEImplementation extends SSLImplementation
     }
 
 
+    @Override
     public String getImplementationName(){
       return "JSSE";
     }
       
+    @Override
     public ServerSocketFactory getServerSocketFactory()  {
         ServerSocketFactory ssf = factory.getSocketFactory();
         return ssf;
     } 
 
+    @Override
     public SSLSupport getSSLSupport(Socket s) {
         SSLSupport ssls = factory.getSSLSupport(s);
         return ssls;
diff --git a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
index f588525d2..adb8286f9 100644
--- a/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
+++ b/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
@@ -115,6 +115,7 @@ public class JSSESocketFactory
     public JSSESocketFactory () {
     }
 
+    @Override
     public ServerSocket createSocket (int port)
         throws IOException
     {
@@ -124,6 +125,7 @@ public class JSSESocketFactory
         return socket;
     }
     
+    @Override
     public ServerSocket createSocket (int port, int backlog)
         throws IOException
     {
@@ -133,6 +135,7 @@ public class JSSESocketFactory
         return socket;
     }
     
+    @Override
     public ServerSocket createSocket (int port, int backlog,
                                       InetAddress ifAddress)
         throws IOException
@@ -144,6 +147,7 @@ public class JSSESocketFactory
         return socket;
     }
     
+    @Override
     public Socket acceptSocket(ServerSocket socket)
         throws IOException
     {
@@ -157,6 +161,7 @@ public class JSSESocketFactory
         return asock;
     }
 
+    @Override
     public void handshake(Socket sock) throws IOException {
         //we do getSession instead of startHandshake() so we can call this multiple times
     	SSLSession session = ((SSLSocket)sock).getSession();
diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java b/java/org/apache/tomcat/util/threads/TaskQueue.java
index 707776ca1..757acc0a6 100644
--- a/java/org/apache/tomcat/util/threads/TaskQueue.java
+++ b/java/org/apache/tomcat/util/threads/TaskQueue.java
@@ -58,6 +58,7 @@ public class TaskQueue extends LinkedBlockingQueue<Runnable> {
         return super.offer(o,timeout,unit); //forces the item onto the queue, to be used if the task is rejected
     }
 
+    @Override
     public boolean offer(Runnable o) {
       //we can't do any checks
         if (parent==null) return super.offer(o);