Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 74441 invoked from network); 5 Nov 2009 01:10:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Nov 2009 01:10:06 -0000 Received: (qmail 56393 invoked by uid 500); 5 Nov 2009 01:10:05 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 56316 invoked by uid 500); 5 Nov 2009 01:10:05 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 56305 invoked by uid 99); 5 Nov 2009 01:10:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2009 01:10:05 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Nov 2009 01:10:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D6FBF23888A6; Thu, 5 Nov 2009 01:09:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r832949 - in /tomcat/trunk/java/org/apache/catalina: ant/jmx/JMXAccessorTask.java core/ApplicationHttpResponse.java loader/WebappClassLoader.java tribes/transport/bio/BioReceiver.java valves/JDBCAccessLogValve.java Date: Thu, 05 Nov 2009 01:09:39 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091105010939.D6FBF23888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Thu Nov 5 01:09:39 2009 New Revision: 832949 URL: http://svn.apache.org/viewvc?rev=832949&view=rev Log: Add a few annotations missed by recent patches Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=832949&r1=832948&r2=832949&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java (original) +++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Thu Nov 5 01:09:39 2009 @@ -338,6 +338,7 @@ * @exception BuildException * if a validation error occurs */ + @Override public void execute() throws BuildException { if (testIfCondition() && testUnlessCondition()) { try { Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java?rev=832949&r1=832948&r2=832949&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpResponse.java Thu Nov 5 01:09:39 2009 @@ -354,6 +354,7 @@ * @deprecated */ @Deprecated + @Override public void setStatus(int sc, String msg) { if (!included) Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=832949&r1=832948&r2=832949&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Thu Nov 5 01:09:39 2009 @@ -249,6 +249,7 @@ protected HashMap notFoundResources = new LinkedHashMap() { private static final long serialVersionUID = 1L; + @Override protected boolean removeEldestEntry( Map.Entry eldest) { return size() > 1000; @@ -817,6 +818,7 @@ /** * Render a String representation of this object. */ + @Override public String toString() { StringBuilder sb = new StringBuilder("WebappClassLoader\r\n"); @@ -847,6 +849,7 @@ /** * Add the specified URL to the classloader. */ + @Override protected void addURL(URL url) { super.addURL(url); hasExternalRepositories = true; @@ -862,6 +865,7 @@ * * @exception ClassNotFoundException if the class was not found */ + @Override public Class findClass(String name) throws ClassNotFoundException { if (log.isDebugEnabled()) @@ -959,6 +963,7 @@ * * @param name Name of the resource to be found */ + @Override public URL findResource(final String name) { if (log.isDebugEnabled()) @@ -997,6 +1002,7 @@ * * @exception IOException if an input/output error occurs */ + @Override public Enumeration findResources(String name) throws IOException { if (log.isDebugEnabled()) @@ -1081,6 +1087,7 @@ * * @param name Name of the resource to return a URL for */ + @Override public URL getResource(String name) { if (log.isDebugEnabled()) @@ -1156,6 +1163,7 @@ * * @param name Name of the resource to return an input stream for */ + @Override public InputStream getResourceAsStream(String name) { if (log.isDebugEnabled()) @@ -1238,6 +1246,7 @@ * * @exception ClassNotFoundException if the class was not found */ + @Override public Class loadClass(String name) throws ClassNotFoundException { return (loadClass(name, false)); @@ -1270,6 +1279,7 @@ * * @exception ClassNotFoundException if the class was not found */ + @Override public synchronized Class loadClass(String name, boolean resolve) throws ClassNotFoundException { @@ -1408,6 +1418,7 @@ * @param codeSource where the code was loaded from * @return PermissionCollection for CodeSource */ + @Override protected PermissionCollection getPermissions(CodeSource codeSource) { String codeUrl = codeSource.getLocation().toString(); @@ -1434,6 +1445,7 @@ * along with any URLs subsequently appended by the addURL() method. * @return the search path of URLs for loading classes and resources. */ + @Override public URL[] getURLs() { if (repositoryURLs != null) { Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=832949&r1=832948&r2=832949&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java Thu Nov 5 01:09:39 2009 @@ -46,6 +46,7 @@ * @throws IOException * @todo Implement this org.apache.catalina.tribes.ChannelReceiver method */ + @Override public void start() throws IOException { super.start(); try { @@ -83,6 +84,7 @@ * * @todo Implement this org.apache.catalina.tribes.ChannelReceiver method */ + @Override public void stop() { setListen(false); try { Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=832949&r1=832948&r2=832949&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Thu Nov 5 01:09:39 2009 @@ -455,7 +455,8 @@ * @exception IOException Should not be thrown. * @exception ServletException Database SQLException is wrapped * in a ServletException. - */ + */ + @Override public void invoke(Request request, Response response) throws IOException, ServletException { final String EMPTY = "" ; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org