From fdebcff65eabd68e7cfe524266073d22ed6d447d Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 8 Sep 2010 19:39:36 +0000
Subject: [PATCH] Fix @Override warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@995218 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/DefaultInstanceManager.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java b/java/org/apache/catalina/core/DefaultInstanceManager.java
index 8b3c6b1fa..12096b957 100644
--- a/java/org/apache/catalina/core/DefaultInstanceManager.java
+++ b/java/org/apache/catalina/core/DefaultInstanceManager.java
@@ -112,16 +112,19 @@ public class DefaultInstanceManager implements InstanceManager {
         this.injectionMap = injectionMap;
     }
 
+    @Override
     public Object newInstance(String className) throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException {
         Class<?> clazz = loadClassMaybePrivileged(className, classLoader);
         return newInstance(clazz.newInstance(), clazz);
     }
 
+    @Override
     public Object newInstance(final String className, final ClassLoader classLoader) throws IllegalAccessException, NamingException, InvocationTargetException, InstantiationException, ClassNotFoundException {
         Class<?> clazz = classLoader.loadClass(className);
         return newInstance(clazz.newInstance(), clazz);
     }
 
+    @Override
     public void newInstance(Object o) 
             throws IllegalAccessException, InvocationTargetException, NamingException {
         newInstance(o, o.getClass());
@@ -136,6 +139,7 @@ public class DefaultInstanceManager implements InstanceManager {
         return instance;
     }
 
+    @Override
     public void destroyInstance(Object instance) throws IllegalAccessException, InvocationTargetException {
         if (!ignoreAnnotations) {
             preDestroy(instance, instance.getClass());
@@ -162,6 +166,7 @@ public class DefaultInstanceManager implements InstanceManager {
         if (Globals.IS_SECURITY_ENABLED) {
             methods = AccessController.doPrivileged(
                     new PrivilegedAction<Method[]>(){
+                @Override
                 public Method[] run(){
                     return clazz.getDeclaredMethods();
                 }
@@ -215,6 +220,7 @@ public class DefaultInstanceManager implements InstanceManager {
         if (Globals.IS_SECURITY_ENABLED) {
             methods = AccessController.doPrivileged(
                     new PrivilegedAction<Method[]>(){
+                @Override
                 public Method[] run(){
                     return clazz.getDeclaredMethods();
                 }
@@ -275,6 +281,7 @@ public class DefaultInstanceManager implements InstanceManager {
                 final Class<?> clazz2 = clazz;
                 fields = AccessController.doPrivileged(
                         new PrivilegedAction<Field[]>(){
+                    @Override
                     public Field[] run(){
                         return clazz2.getDeclaredFields();
                     }
@@ -318,6 +325,7 @@ public class DefaultInstanceManager implements InstanceManager {
                 final Class<?> clazz2 = clazz;
                 methods = AccessController.doPrivileged(
                         new PrivilegedAction<Method[]>(){
+                    @Override
                     public Method[] run(){
                         return clazz2.getDeclaredMethods();
                     }
@@ -372,6 +380,7 @@ public class DefaultInstanceManager implements InstanceManager {
             try {
                 clazz = AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>() {
 
+                    @Override
                     public Class<?> run() throws Exception {
                         return loadClass(className, classLoader);
                     }
-- 
2.11.0