This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new daeab23c24 Minor fixes from code review
daeab23c24 is described below
commit daeab23c246d7c963c793db2b05f530cb12a110d
Author: remm <[email protected]>
AuthorDate: Mon Jun 15 14:42:42 2026 +0200
Minor fixes from code review
---
java/org/apache/catalina/startup/CertificateCreateRule.java | 13 ++++++++++++-
java/org/apache/catalina/startup/HostConfig.java | 2 +-
java/org/apache/catalina/startup/LocalStrings.properties | 2 ++
java/org/apache/catalina/storeconfig/ConnectorSF.java | 8 +++-----
.../apache/catalina/storeconfig/ConnectorStoreAppender.java | 3 +--
java/org/apache/catalina/storeconfig/LoaderSF.java | 3 ++-
.../org/apache/catalina/storeconfig/LocalStrings.properties | 1 +
java/org/apache/catalina/storeconfig/ManagerSF.java | 2 +-
.../apache/catalina/storeconfig/StoreContextAppender.java | 1 -
java/org/apache/catalina/storeconfig/StoreDescription.java | 4 ++--
java/org/apache/catalina/storeconfig/StoreFactoryBase.java | 2 +-
java/org/apache/catalina/storeconfig/StoreFileMover.java | 12 +++---------
12 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/catalina/startup/CertificateCreateRule.java
b/java/org/apache/catalina/startup/CertificateCreateRule.java
index 0daf44c245..90a84b0d76 100644
--- a/java/org/apache/catalina/startup/CertificateCreateRule.java
+++ b/java/org/apache/catalina/startup/CertificateCreateRule.java
@@ -16,10 +16,13 @@
*/
package org.apache.catalina.startup;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.digester.Rule;
import org.apache.tomcat.util.net.SSLHostConfig;
import org.apache.tomcat.util.net.SSLHostConfigCertificate;
import org.apache.tomcat.util.net.SSLHostConfigCertificate.Type;
+import org.apache.tomcat.util.res.StringManager;
import org.xml.sax.Attributes;
/**
@@ -27,6 +30,9 @@ import org.xml.sax.Attributes;
*/
public class CertificateCreateRule extends Rule {
+ private static final Log log =
LogFactory.getLog(CertificateCreateRule.class);
+ private static final StringManager sm =
StringManager.getManager(CertificateCreateRule.class);
+
/**
* Default constructor.
*/
@@ -42,7 +48,12 @@ public class CertificateCreateRule extends Rule {
if (typeValue == null || typeValue.isEmpty()) {
type = Type.UNDEFINED;
} else {
- type = Type.valueOf(typeValue);
+ try {
+ type = Type.valueOf(typeValue);
+ } catch (IllegalArgumentException e) {
+ log.warn(sm.getString("certificate.unknownType", typeValue));
+ type = Type.UNDEFINED;
+ }
}
SSLHostConfigCertificate certificate = new
SSLHostConfigCertificate(sslHostConfig, type);
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 47d5279818..a2a395786a 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -691,7 +691,7 @@ public class HostConfig implements LifecycleListener {
addGlobalRedeployResources(deployedApp);
}
- deployed.put(context.getName(), deployedApp);
+ deployed.put(cn.getName(), deployedApp);
if (log.isInfoEnabled()) {
log.info(sm.getString("hostConfig.deployDescriptor.finished",
contextXml.getAbsolutePath(),
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties
b/java/org/apache/catalina/startup/LocalStrings.properties
index 585f24706e..fa8898aded 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -39,6 +39,8 @@ catalina.usage=usage: java
org.apache.catalina.startup.Catalina [ -config {pathn
catalinaConfigurationSource.cannotObtainURL=Cannot obtain resource for
specified location [{0}]: no readable file, classloader resource, or this is
not a resolvable URI
+certificate.unknownType=Unknown certificate type [{0}], using UNDEFINED
+
connector.noSetExecutor=Connector [{0}] does not support external executors.
Method setExecutor(java.util.concurrent.Executor) not found.
connector.noSetSSLImplementationName=Connector [{0}] does not support changing
the SSL implementation. Method setSslImplementationName(String) not found.
diff --git a/java/org/apache/catalina/storeconfig/ConnectorSF.java
b/java/org/apache/catalina/storeconfig/ConnectorSF.java
index e4d10344b1..680a579915 100644
--- a/java/org/apache/catalina/storeconfig/ConnectorSF.java
+++ b/java/org/apache/catalina/storeconfig/ConnectorSF.java
@@ -46,11 +46,9 @@ public class ConnectorSF extends StoreFactoryBase {
// Store nested <UpgradeProtocol> elements
UpgradeProtocol[] upgradeProtocols =
connector.findUpgradeProtocols();
storeElementArray(aWriter, indent, upgradeProtocols);
- if (Boolean.TRUE.equals(connector.getProperty("SSLEnabled"))) {
- // Store nested <SSLHostConfig> elements
- SSLHostConfig[] hostConfigs = connector.findSslHostConfigs();
- storeElementArray(aWriter, indent, hostConfigs);
- }
+ // Store nested <SSLHostConfig> elements
+ SSLHostConfig[] hostConfigs = connector.findSslHostConfigs();
+ storeElementArray(aWriter, indent, hostConfigs);
}
}
diff --git a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
index 7820edf50a..b42d7649c0 100644
--- a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
+++ b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
@@ -82,7 +82,7 @@ public class ConnectorStoreAppender extends StoreAppender {
String protocol = connector.getProtocol();
List<String> propertyKeys = getPropertyKeys(connector);
// Create blank instance
- Object bean2 = new Connector(protocol);// defaultInstance(bean);
+ Object bean2 = new Connector(protocol);
for (String key : propertyKeys) {
Object value = IntrospectionUtils.getProperty(bean, key);
if (desc.isTransientAttribute(key)) {
@@ -245,7 +245,6 @@ public class ConnectorStoreAppender extends StoreAppender {
* <ul>
* <li>Special handling to default jkHome.</li>
* <li>Don't save catalina.base path at server.xml</li>
- * <li>
* </ul>
*
* @see org.apache.catalina.storeconfig.StoreAppender#isPrintValue(Object,
Object, String, StoreDescription)
diff --git a/java/org/apache/catalina/storeconfig/LoaderSF.java
b/java/org/apache/catalina/storeconfig/LoaderSF.java
index 0c061c26c5..0b67d8c6c9 100644
--- a/java/org/apache/catalina/storeconfig/LoaderSF.java
+++ b/java/org/apache/catalina/storeconfig/LoaderSF.java
@@ -19,6 +19,7 @@ package org.apache.catalina.storeconfig;
import java.io.PrintWriter;
import org.apache.catalina.Loader;
+import org.apache.catalina.loader.ParallelWebappClassLoader;
import org.apache.catalina.loader.WebappLoader;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -71,6 +72,6 @@ public class LoaderSF extends StoreFactoryBase {
return false;
}
return (!wloader.getDelegate()) &&
-
wloader.getLoaderClass().equals("org.apache.catalina.loader.WebappClassLoader");
+
wloader.getLoaderClass().equals(ParallelWebappClassLoader.class.getName());
}
}
diff --git a/java/org/apache/catalina/storeconfig/LocalStrings.properties
b/java/org/apache/catalina/storeconfig/LocalStrings.properties
index e19dd0014b..064dfcf71e 100644
--- a/java/org/apache/catalina/storeconfig/LocalStrings.properties
+++ b/java/org/apache/catalina/storeconfig/LocalStrings.properties
@@ -47,5 +47,6 @@ storeConfigListener.registerError=Error registering
StoreConfig MBean
storeFactory.noDescriptor=Descriptor for element [{0}].[{1}] not configured
storeFileMover.directoryCreationError=Cannot create directory [{0}]
+storeFileMover.null=Invalid null basename, filename or encoding
storeFileMover.renameError=Cannot rename [{0}] to [{1}]
storeFileMover.restoreError=Rename [{0}] to [{1}] failed and restoring also
failed
diff --git a/java/org/apache/catalina/storeconfig/ManagerSF.java
b/java/org/apache/catalina/storeconfig/ManagerSF.java
index 5d24389858..c10c89b5fe 100644
--- a/java/org/apache/catalina/storeconfig/ManagerSF.java
+++ b/java/org/apache/catalina/storeconfig/ManagerSF.java
@@ -67,7 +67,7 @@ public class ManagerSF extends StoreFactoryBase {
*/
protected boolean isDefaultManager(StandardManager smanager) {
- return "SESSIONS.ser".equals(smanager.getPathname()) &&
(smanager.getMaxActiveSessions() == -1);
+ return smanager.getPathname() == null &&
(smanager.getMaxActiveSessions() == -1);
}
diff --git a/java/org/apache/catalina/storeconfig/StoreContextAppender.java
b/java/org/apache/catalina/storeconfig/StoreContextAppender.java
index 65ed790d3a..5049b59049 100644
--- a/java/org/apache/catalina/storeconfig/StoreContextAppender.java
+++ b/java/org/apache/catalina/storeconfig/StoreContextAppender.java
@@ -61,7 +61,6 @@ public class StoreContextAppender extends StoreAppender {
* <li>Special handling to default workDir.</li>
* <li>Don't save path at external context.xml</li>
* <li>Don't generate docBase for host.appBase webapps
- * <LI>
* </ul>
* {@inheritDoc}
*/
diff --git a/java/org/apache/catalina/storeconfig/StoreDescription.java
b/java/org/apache/catalina/storeconfig/StoreDescription.java
index 64c67b4913..a8edcde81c 100644
--- a/java/org/apache/catalina/storeconfig/StoreDescription.java
+++ b/java/org/apache/catalina/storeconfig/StoreDescription.java
@@ -359,7 +359,7 @@ public class StoreDescription {
*
* @param classname The class name to check
*
- * @return is classname attribute?
+ * @return true if the classname is a transient child
*/
public boolean isTransientChild(String classname) {
if (transientChildren != null) {
@@ -373,7 +373,7 @@ public class StoreDescription {
*
* @param attribute The attribute name to check
*
- * @return is transient attribute?
+ * @return true if the attribute is transient
*/
public boolean isTransientAttribute(String attribute) {
if (transientAttributes != null) {
diff --git a/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
b/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
index a3ec337d1f..626a5e6642 100644
--- a/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
+++ b/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
@@ -24,7 +24,7 @@ import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
/**
- * StoreFactory saves special elements. Output was generate with
StoreAppenders.
+ * StoreFactory saves special elements. Output was generated with
StoreAppenders.
*/
public class StoreFactoryBase implements IStoreFactory {
/**
diff --git a/java/org/apache/catalina/storeconfig/StoreFileMover.java
b/java/org/apache/catalina/storeconfig/StoreFileMover.java
index 262066c757..43180e314a 100644
--- a/java/org/apache/catalina/storeconfig/StoreFileMover.java
+++ b/java/org/apache/catalina/storeconfig/StoreFileMover.java
@@ -28,8 +28,6 @@ import org.apache.tomcat.util.res.StringManager;
/**
* Move server.xml or context.xml as backup
- * <p>
- * TODO Get Encoding from Registry
*/
public class StoreFileMover {
@@ -145,17 +143,13 @@ public class StoreFileMover {
init();
}
- /**
- * Calculate file objects for the old and new configuration files.
- */
- public StoreFileMover() {
- init();
- }
-
/**
* Generate the Filename to new with TimeStamp.
*/
public void init() {
+ if (getBasename() == null || getFilename() == null || getEncoding() ==
null) {
+ throw new
IllegalArgumentException(sm.getString("storeFileMover.null"));
+ }
String configFile = getFilename();
configOld = new File(configFile);
if (!configOld.isAbsolute()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
