Skip to content

Commit

Permalink
Re-apply standard formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
markt-asf committed Feb 7, 2025
1 parent 8831f15 commit 07ceceb
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion java/org/apache/catalina/WebResourceRoot.java
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ default void setReadOnly(boolean readOnly) {

/**
* @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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@
* </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,
Expand Down Expand Up @@ -96,8 +95,7 @@ public String getDataSourceName() {
}

/**
* @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;
Expand Down Expand Up @@ -128,7 +126,8 @@ public void init() {
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 (?, ?, ?, ?)";
Expand Down
2 changes: 1 addition & 1 deletion java/org/apache/catalina/servlets/DefaultServlet.java
Original file line number Diff line number Diff line change
Expand Up @@ -1467,7 +1467,7 @@ protected ArrayList<Range> parseRange(HttpServletRequest request, HttpServletRes
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
Expand Down
8 changes: 4 additions & 4 deletions java/org/apache/catalina/servlets/WebdavServlet.java
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
* 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
Expand Down Expand Up @@ -1859,8 +1859,8 @@ protected void doUnlock(HttpServletRequest req, HttpServletResponse resp) throws
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;
}
}
Expand Down
3 changes: 2 additions & 1 deletion java/org/apache/catalina/session/DataSourceStore.java
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,8 @@ protected Connection open() throws SQLException {
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);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion java/org/apache/catalina/util/RateLimiter.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ default String getPolicy() {
/**
* 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
*
Expand Down
2 changes: 2 additions & 0 deletions java/org/apache/catalina/valves/JDBCAccessLogValve.java
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
*
* @author Andre de Jesus
* @author Peter Rossbach
*
* @deprecated Non scalable design, and not documented. Will be removed in Tomcat 12.
*/
@Deprecated
Expand Down Expand Up @@ -577,6 +578,7 @@ protected void open() throws SQLException {

/**
* Prepare tables for processing. Used by subclasses for testing.
*
* @throws SQLException if an exception occurs
*/
protected void prepare() throws SQLException {
Expand Down
4 changes: 2 additions & 2 deletions java/org/apache/coyote/NonPipeliningProcessor.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

/**
* 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 {

Expand Down

0 comments on commit 07ceceb

Please sign in to comment.