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 f2b95e3a08 Re-apply standard formatting
f2b95e3a08 is described below
commit f2b95e3a085f6c5346eecde9ef2593b5c99a0b30
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Feb 7 13:21:36 2025 +0000
Re-apply standard formatting
---
java/jakarta/servlet/http/Cookie.java | 2 +-
java/org/apache/catalina/WebResourceRoot.java | 2 +-
java/org/apache/catalina/connector/Request.java | 2 +-
java/org/apache/catalina/servlets/DataSourcePropertyStore.java | 9 ++++-----
java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
java/org/apache/catalina/servlets/WebdavServlet.java | 8 ++++----
java/org/apache/catalina/session/DataSourceStore.java | 3 ++-
java/org/apache/catalina/util/RateLimiter.java | 2 +-
java/org/apache/coyote/NonPipeliningProcessor.java | 4 ++--
java/org/apache/el/util/Validation.java | 2 +-
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/java/jakarta/servlet/http/Cookie.java
b/java/jakarta/servlet/http/Cookie.java
index 20ec7a741b..8a659684d4 100644
--- a/java/jakarta/servlet/http/Cookie.java
+++ b/java/jakarta/servlet/http/Cookie.java
@@ -235,7 +235,7 @@ public class Cookie implements Cloneable, Serializable {
* The default value is <code>false</code>.
*
* @param secure if <code>true</code>, sends the cookie from the browser
to the server only when using a secure
- * protocol; if <code>false</code>, sent on any protocol
+ * protocol; if <code>false</code>, sent on any protocol
*
* @see #getSecure
*/
diff --git a/java/org/apache/catalina/WebResourceRoot.java
b/java/org/apache/catalina/WebResourceRoot.java
index f96dc7d7e8..b99874ee3f 100644
--- a/java/org/apache/catalina/WebResourceRoot.java
+++ b/java/org/apache/catalina/WebResourceRoot.java
@@ -425,7 +425,7 @@ public interface WebResourceRoot extends Lifecycle {
/**
* @return {@code true} if the main resources are read only, otherwise
{@code false}. The default implementation
- * returns {@code false}.
+ * returns {@code false}.
*/
default boolean isReadOnly() {
return false;
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 0dfc63019d..a6b0beb7ed 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -448,7 +448,7 @@ public class Request implements HttpServletRequest {
userPrincipal = null;
subject = null;
parametersParsed = false;
- if (connector != null ) {
+ if (connector != null) {
maxParameterCount = connector.getMaxParameterCount();
} else {
maxParameterCount = -1;
diff --git a/java/org/apache/catalina/servlets/DataSourcePropertyStore.java
b/java/org/apache/catalina/servlets/DataSourcePropertyStore.java
index bbb2cf3515..fd700dfc51 100644
--- a/java/org/apache/catalina/servlets/DataSourcePropertyStore.java
+++ b/java/org/apache/catalina/servlets/DataSourcePropertyStore.java
@@ -52,8 +52,7 @@ import org.w3c.dom.Node;
* </ul>
* The table name used can be configured using the <code>tableName</code>
property of the store.
* <p>
- * Example table schema:
- * <code>CREATE TABLE properties (
+ * Example table schema: <code>CREATE TABLE properties (
* path VARCHAR(1024) NOT NULL,
* namespace VARCHAR(64) NOT NULL,
* name VARCHAR(64) NOT NULL,
@@ -97,8 +96,7 @@ public class DataSourcePropertyStore implements
WebdavServlet.PropertyStore {
}
/**
- * @param dataSourceName the DataSource JNDI name, will be prefixed with
- * java:comp/env for the lookup.
+ * @param dataSourceName the DataSource JNDI name, will be prefixed with
java:comp/env for the lookup.
*/
public void setDataSourceName(String dataSourceName) {
this.dataSourceName = dataSourceName;
@@ -129,7 +127,8 @@ public class DataSourcePropertyStore implements
WebdavServlet.PropertyStore {
try {
dataSource = (DataSource) ((new
InitialContext()).lookup("java:comp/env/" + dataSourceName));
} catch (NamingException e) {
- throw new
IllegalArgumentException(sm.getString("webdavservlet.dataSourceStore.noDataSource",
dataSourceName), e);
+ throw new IllegalArgumentException(
+
sm.getString("webdavservlet.dataSourceStore.noDataSource", dataSourceName), e);
}
}
addPropertyStatement = "INSERT INTO " + tableName + " (path,
namespace, name, node) VALUES (?, ?, ?, ?)";
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 20ad454b94..0a6a4f0a1e 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1501,7 +1501,7 @@ public class DefaultServlet extends HttpServlet {
if (response.isCommitted()) {
/*
* Ideally, checkIfRange() would be changed to return Boolean
so the three states (satisfied,
- * unsatisfied and error) could each be communicated via the
return value. There isn't a backwards
+ * unsatisfied and error) could each be communicated via the
return value. There isn't a backwards
* compatible way to do that that doesn't involve changing the
method name and there are benefits to
* retaining the consistency of the existing method name
pattern. Hence, this 'trick'. For the error
* state, checkIfRange() will call response.sendError() which
will commit the response which this method
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 11ebb5b7a7..1553ee58a5 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -86,8 +86,8 @@ import org.xml.sax.SAXException;
* users and WebDAV users, the WebDAV servlet may be mounted at a sub-path
(e.g. <code>/webdav/*</code>) which creates
* an additional mapping for the entire web application under that sub-path,
with WebDAV access to all the resources.
* <p>
- * By default, the <code>WEB-INF</code> and <code>META-INF</code> directories
are not accessible via WebDAV. This may
- * be changed by setting the <code>allowSpecialPaths</code> initialisation
parameter to <code>true</code>.
+ * By default, the <code>WEB-INF</code> and <code>META-INF</code> directories
are not accessible via WebDAV. This may be
+ * changed by setting the <code>allowSpecialPaths</code> initialisation
parameter to <code>true</code>.
* <p>
* It is also possible to enable WebDAV access to a sub-set of the standard
web application URL space rather than
* creating an additional, WebDAV specific mapping. To do this, map the WebDAV
servlet to the desired sub-path and set
@@ -1860,8 +1860,8 @@ public class WebdavServlet extends DefaultServlet
implements PeriodicEventListen
private boolean isSpecialPath(final String path) {
if (!allowSpecialPaths) {
String upperCasePath = path.toUpperCase(Locale.ENGLISH);
- if (upperCasePath.startsWith("/WEB-INF/") ||
upperCasePath.startsWith("/META-INF/")
- || upperCasePath.equals("/WEB-INF") ||
upperCasePath.equals("/META-INF")) {
+ if (upperCasePath.startsWith("/WEB-INF/") ||
upperCasePath.startsWith("/META-INF/") ||
+ upperCasePath.equals("/WEB-INF") ||
upperCasePath.equals("/META-INF")) {
return true;
}
}
diff --git a/java/org/apache/catalina/session/DataSourceStore.java
b/java/org/apache/catalina/session/DataSourceStore.java
index 3484227e8f..54971e2541 100644
--- a/java/org/apache/catalina/session/DataSourceStore.java
+++ b/java/org/apache/catalina/session/DataSourceStore.java
@@ -648,7 +648,8 @@ public class DataSourceStore extends StoreBase {
Context envCtx = (Context) (new
InitialContext()).lookup("java:comp/env");
this.dataSource = (DataSource)
envCtx.lookup(this.dataSourceName);
} catch (NamingException e) {
-
context.getLogger().error(sm.getString("dataSourceStore.wrongDataSource",
this.dataSourceName), e);
+
context.getLogger().error(sm.getString("dataSourceStore.wrongDataSource",
this.dataSourceName),
+ e);
}
}
}
diff --git a/java/org/apache/catalina/util/RateLimiter.java
b/java/org/apache/catalina/util/RateLimiter.java
index d1beb65399..bdd8b27736 100644
--- a/java/org/apache/catalina/util/RateLimiter.java
+++ b/java/org/apache/catalina/util/RateLimiter.java
@@ -92,7 +92,7 @@ public interface RateLimiter {
/**
* Provide the quota header for this rate limit for a given request count
within the current time window.
*
- * @param requestCount The request count within the current time window
+ * @param requestCount The request count within the current time window
*
* @return the quota header for the given value of request count
*
diff --git a/java/org/apache/coyote/NonPipeliningProcessor.java
b/java/org/apache/coyote/NonPipeliningProcessor.java
index 75a6da0830..a6e8759a57 100644
--- a/java/org/apache/coyote/NonPipeliningProcessor.java
+++ b/java/org/apache/coyote/NonPipeliningProcessor.java
@@ -18,8 +18,8 @@ package org.apache.coyote;
/**
* Marker interface used to indicate that the {@link Processor} does not
implement pipe-lining of requests (e.g.
- * HTTP/1.1 supports pipe-lining whereas HTTP/2 does not) which may enable
some components to clear references sooner
- * to aid GC.
+ * HTTP/1.1 supports pipe-lining whereas HTTP/2 does not) which may enable
some components to clear references sooner to
+ * aid GC.
*/
public interface NonPipeliningProcessor extends Processor {
diff --git a/java/org/apache/el/util/Validation.java
b/java/org/apache/el/util/Validation.java
index 498c9dda7d..2311122097 100644
--- a/java/org/apache/el/util/Validation.java
+++ b/java/org/apache/el/util/Validation.java
@@ -27,7 +27,7 @@ public class Validation {
"false", "final", "finally", "float", "for", "goto", "if",
"implements", "import", "instanceof", "int",
"interface", "long", "native", "new", "null", "package",
"private", "protected", "public", "return",
"short", "static", "strictfp", "super", "switch", "synchronized",
"this", "throw", "throws", "transient",
- "true", "try", "void", "volatile", "while"};
+ "true", "try", "void", "volatile", "while" };
private static final boolean SKIP_IDENTIFIER_CHECK =
Boolean.getBoolean("org.apache.el.parser.SKIP_IDENTIFIER_CHECK");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
