Port fix for bug 40929. Update JavaDoc

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

diff --git a/java/org/apache/catalina/loader/StandardClassLoader.java b/java/org/apache/catalina/loader/StandardClassLoader.java
index b569a5d..7af0570 100644 (file)
--- a/java/org/apache/catalina/loader/StandardClassLoader.java
+++ b/java/org/apache/catalina/loader/StandardClassLoader.java
@@ -22,23 +22,8 @@ import java.net.URL;
 import java.net.URLClassLoader;
 
 /**
- * Subclass implementation of <b>java.net.URLClassLoader</b> that knows how
- * to load classes from disk directories, as well as local and remote JAR
- * files.  It also implements the <code>Reloader</code> interface, to provide
- * automatic reloading support to the associated loader.
- * <p>
- * In all cases, URLs must conform to the contract specified by
- * <code>URLClassLoader</code> - any URL that ends with a "/" character is
- * assumed to represent a directory; all other URLs are assumed to be the
- * address of a JAR file.
- * <p>
- * <strong>IMPLEMENTATION NOTE</strong> - Local repositories are searched in
- * the order they are added via the initial constructor and/or any subsequent
- * calls to <code>addRepository()</code>.
- * <p>
- * <strong>IMPLEMENTATION NOTE</strong> - At present, there are no dependencies
- * from this class to any other Catalina class, so that it could be used
- * independently.
+ * Subclass implementation of <b>java.net.URLClassLoader</b>. There are no
+ * functional differences between this class and <b>java.net.URLClassLoader</b>.
  *
  * @author Craig R. McClanahan
  * @author Remy Maucherat

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6651e1f..9c9eec9 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -22,11 +22,15 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        <bug>37509</bug>: Do not remove whitespace from the end of values
+        defined in logging.properties files. (markt)
+      </fix>
+      <fix>
         <bug>40844</bug> Missing syncs in JDBCRealm. (markt)
       </fix>
       <fix>
-        <bug>37509</bug>: Do not remove whitespace from the end of values
-        defined in logging.properties files. (markt)
+        <bug>40929</bug>: Correct JavaDoc for StandardClassLoader. (markt)
+        (markt)
       </fix>
     </changelog>
   </subsection>