Author: markt
Date: Fri May 6 07:54:53 2011
New Revision: 1100121
URL: http://svn.apache.org/viewvc?rev=1100121&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51154
Remove duplicate @deprecated tags
Patch provided by sebb
Modified:
tomcat/trunk/java/javax/servlet/ServletContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1100121&r1=1100120&r2=1100121&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Fri May 6 07:54:53 2011
@@ -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
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1100121&r1=1100120&r2=1100121&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri May 6 07:54:53 2011
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
