Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51154

Remove duplicate @deprecated tags
Patch provided by sebb

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

diff --git a/java/javax/servlet/ServletContext.java b/java/javax/servlet/ServletContext.java
index 88d098d..cfcfaf6 100644 (file)
--- a/java/javax/servlet/ServletContext.java
+++ b/java/javax/servlet/ServletContext.java
@@ -286,7 +286,6 @@ public interface ServletContext {
      *             the <code>ServletContext</code> class and can perform shared
      *             business logic by invoking methods on common non-servlet
      *             classes.
-     * @deprecated
      */
     @SuppressWarnings("dep-ann")
     // Spec API does not use @Deprecated
@@ -301,7 +300,6 @@ public interface ServletContext {
      *             an empty enumeration and remains only to preserve binary
      *             compatibility. This method will be permanently removed in a
      *             future version of the Java Servlet API.
-     * @deprecated
      */
     @SuppressWarnings("dep-ann")
     // Spec API does not use @Deprecated
@@ -316,7 +314,6 @@ public interface ServletContext {
      *             empty <code>Enumeration</code> and remains only to preserve
      *             binary compatibility. This method will be permanently removed
      *             in a future version of the Java Servlet API.
-     * @deprecated
      */
     @SuppressWarnings("dep-ann")
     // Spec API does not use @Deprecated
@@ -340,7 +337,6 @@ public interface ServletContext {
      *             This method was originally defined to write an exception's
      *             stack trace and an explanatory error message to the servlet
      *             log file.
-     * @deprecated
      */
     @SuppressWarnings("dep-ann")
     // Spec API does not use @Deprecated

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 10756a6..95bdc39 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -237,6 +237,10 @@
         <bug>51135</bug>: Fix auto-detection of JAVA_HOME for 64-bit Windows
         platforms that only have a 32-bit JVM installed. (markt) 
       </fix>
+      <fix>
+        <bug>51154</bug>: Remove duplicate @deprecated tags in ServletContext
+        Javadoc. Patch provided by sebb. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>