[tomcat] branch 8.5.x updated: Move null check for context to before the first use of context

[markt]

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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new f1dd31c  Move null check for context to before the first use of context
f1dd31c is described below

commit f1dd31cbc62bfbdb08a7aab5b43cd6eb58c01861
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Nov 3 14:49:12 2021 +0000

    Move null check for context to before the first use of context
---
 java/org/apache/catalina/webresources/StandardRoot.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/webresources/StandardRoot.java 
b/java/org/apache/catalina/webresources/StandardRoot.java
index 65d1f11..b42ed21 100644
--- a/java/org/apache/catalina/webresources/StandardRoot.java
+++ b/java/org/apache/catalina/webresources/StandardRoot.java
@@ -676,15 +676,15 @@ public class StandardRoot extends LifecycleMBeanBase 
implements WebResourceRoot
     protected void initInternal() throws LifecycleException {
         super.initInternal();
 
-        cacheJmxName = register(cache, getObjectNameKeyProperties() + 
",name=Cache");
-
-        registerURLStreamHandlerFactory();
-
         if (context == null) {
             throw new IllegalStateException(
                     sm.getString("standardRoot.noContext"));
         }
 
+        cacheJmxName = register(cache, getObjectNameKeyProperties() + 
",name=Cache");
+
+        registerURLStreamHandlerFactory();
+
         for (List<WebResourceSet> list : allResources) {
             for (WebResourceSet webResourceSet : list) {
                 webResourceSet.init();

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org