Author: markt
Date: Wed Mar 9 15:34:51 2011
New Revision: 1079839
URL: http://svn.apache.org/viewvc?rev=1079839&view=rev
Log:
Better overriding support
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1079839&r1=1079838&r2=1079839&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed Mar 9
15:34:51 2011
@@ -1133,7 +1133,7 @@ public class StandardWrapper extends Con
*/
@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 Con
}
} else {
if (servletSecurityAnnotationScanRequired) {
- processServletSecurityAnnotation(instance.getClass());
+ processServletSecurityAnnotation(getServlet().getClass());
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
