From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 9 Mar 2011 15:34:51 +0000 (+0000)
Subject: Better overriding support
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=bc4756d98a71aadc0f8d93e8aaa4cf60d15ff2fa;p=tomcat7.0

Better overriding support

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

diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index cca942f63..30f2eee02 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1133,7 +1133,7 @@ public class StandardWrapper extends ContainerBase
      */
     @Override
     public void servletSecurityAnnotationScan() throws ServletException {
-        if (instance == null) {
+        if (getServlet() == null) {
             Class<?> clazz = null;
             try {
                 clazz = getParentClassLoader().loadClass(getServletClass());
@@ -1143,7 +1143,7 @@ public class StandardWrapper extends ContainerBase
             }
         } else {
             if (servletSecurityAnnotationScanRequired) {
-                processServletSecurityAnnotation(instance.getClass());
+                processServletSecurityAnnotation(getServlet().getClass());
             }
         }
     }