You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/11/03 14:49:25 UTC
[tomcat] branch main updated: Move null check for context to before
the first use of context
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new ccdd797 Move null check for context to before the first use of context
ccdd797 is described below
commit ccdd79778bf5df8d962b55ccc19c1987ef151eac
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 1e0347e..06e5128 100644
--- a/java/org/apache/catalina/webresources/StandardRoot.java
+++ b/java/org/apache/catalina/webresources/StandardRoot.java
@@ -677,15 +677,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org