From 290baa76c9bb97933dcf744d16915e2fdb687ff9 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 4 Mar 2011 15:31:04 +0000 Subject: [PATCH] Avoid npe git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1078004 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/authenticator/AuthenticatorBase.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java index a84f38613..92a768f8f 100644 --- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java +++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java @@ -481,8 +481,10 @@ public abstract class AuthenticatorBase extends ValveBase // 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? -- 2.11.0