tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1240168 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
Date Fri, 03 Feb 2012 13:49:58 GMT
Author: markt
Date: Fri Feb  3 13:49:58 2012
New Revision: 1240168

URL: http://svn.apache.org/viewvc?rev=1240168&view=rev
Log:
Fix merge error

Modified:
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1240168&r1=1240167&r2=1240168&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Fri Feb  3 13:49:58
2012
@@ -961,10 +961,6 @@ public class MBeanUtils {
 
     }
 
-    /*
-     * @deprecated  Unused. Will be removed in Tomcat 8.0.x
-     */
-    @Deprecated
     /**
      * Create an <code>ObjectName</code> for this
      * <code>Valve</code> object.
@@ -1036,6 +1032,10 @@ public class MBeanUtils {
 
     }
 
+    /*
+     * @deprecated  Unused. Will be removed in Tomcat 8.0.x
+     */
+    @Deprecated
     static Hashtable<String,int[]> seq = new Hashtable<String,int[]>();
     /*
      * @deprecated  Unused. Will be removed in Tomcat 8.0.x



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message