This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 10a5c08baea231de8b51d1aa372a61beed8ec235 Author: Mark Thomas <[email protected]> AuthorDate: Mon Mar 2 18:57:43 2020 +0000 Simplify --- java/org/apache/catalina/core/StandardContext.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 704cadc..dba5d2b 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -5115,11 +5115,10 @@ public class StandardContext extends ContainerBase } // We put the resources into the servlet context - if (ok) + if (ok) { getServletContext().setAttribute (Globals.RESOURCES_ATTR, getResources()); - if (ok ) { if (getInstanceManager() == null) { javax.naming.Context context = null; if (isUseNaming() && getNamingContextListener() != null) { @@ -5133,10 +5132,8 @@ public class StandardContext extends ContainerBase getServletContext().setAttribute( InstanceManager.class.getName(), getInstanceManager()); InstanceManagerBindings.bind(getLoader().getClassLoader(), getInstanceManager()); - } - // Create context attributes that will be required - if (ok) { + // Create context attributes that will be required getServletContext().setAttribute( JarScanner.class.getName(), getJarScanner()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
