Author: markt
Date: Fri Mar 4 15:31:04 2011
New Revision: 1078004
URL: http://svn.apache.org/viewvc?rev=1078004&view=rev
Log:
Avoid npe
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1078004&r1=1078003&r2=1078004&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Fri Mar 4 15:31:04 2011
@@ -481,8 +481,10 @@ public abstract class AuthenticatorBase
// The Servlet may specify security constraints through annotations.
// Ensure that they have been processed before constraints are checked
- Wrapper wrapper = (Wrapper) request.getMappingData().wrapper;
- wrapper.servletSecurityAnnotationScan();
+ Wrapper wrapper = (Wrapper) request.getMappingData().wrapper;
+ if (wrapper != null) {
+ wrapper.servletSecurityAnnotationScan();
+ }
Realm realm = this.context.getRealm();
// Is this request URI subject to a security constraint?
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
