This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 352efca5757ede5cdc28975cdc5be640cf6d3735
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Oct 2 11:54:13 2024 +0100
Re-apply code formatting - no functional change
---
java/org/apache/catalina/authenticator/SpnegoAuthenticator.java | 4 ++--
.../apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java | 3 ++-
.../authenticator/jaspic/PersistentProviderRegistrations.java | 4 ++--
java/org/apache/catalina/core/ApplicationFilterFactory.java | 2 +-
java/org/apache/catalina/core/AprLifecycleListener.java | 2 +-
java/org/apache/catalina/manager/StatusTransformer.java | 2 ++
java/org/apache/catalina/realm/JAASRealm.java | 3 ++-
java/org/apache/catalina/realm/RealmBase.java | 6 +++---
java/org/apache/catalina/servlets/WebdavServlet.java | 1 -
java/org/apache/catalina/tribes/util/ExecutorFactory.java | 4 ++--
java/org/apache/catalina/tribes/util/StringManager.java | 6 +++---
java/org/apache/coyote/AbstractProtocol.java | 4 ++--
java/org/apache/coyote/http11/filters/ChunkedInputFilter.java | 4 ++--
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 4 ++--
14 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
index 570ce65413..9227238198 100644
--- a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
@@ -165,8 +165,8 @@ public class SpnegoAuthenticator extends AuthenticatorBase {
authorizationBC.setStart(authorizationBC.getStart() + 10);
byte[] encoded = new byte[authorizationBC.getLength()];
- System.arraycopy(authorizationBC.getBuffer(),
authorizationBC.getStart(),
- encoded, 0, authorizationBC.getLength());
+ System.arraycopy(authorizationBC.getBuffer(),
authorizationBC.getStart(), encoded, 0,
+ authorizationBC.getLength());
byte[] decoded = Base64.getDecoder().decode(encoded);
if (getApplyJava8u40Fix()) {
diff --git
a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
index 73d95329f6..81acb0c4e2 100644
--- a/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
+++ b/java/org/apache/catalina/authenticator/jaspic/AuthConfigFactoryImpl.java
@@ -658,7 +658,8 @@ public class AuthConfigFactoryImpl extends
AuthConfigFactory {
if (serverAuthConfig == null) {
synchronized (serverAuthConfigLock) {
if (serverAuthConfig == null) {
- serverAuthConfig = new
SingleContextServerAuthConfig(serverAuthModule, this.appContext, handler);
+ serverAuthConfig =
+ new
SingleContextServerAuthConfig(serverAuthModule, this.appContext, handler);
}
}
}
diff --git
a/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
b/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
index 875ab1cff0..9295eb81bf 100644
---
a/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
+++
b/java/org/apache/catalina/authenticator/jaspic/PersistentProviderRegistrations.java
@@ -111,8 +111,8 @@ public final class PersistentProviderRegistrations {
}
if (!configParent.exists()) {
if (!configParent.mkdirs()) {
- throw new
SecurityException(sm.getString("persistentProviderRegistrations.mkdirsFail",
- configParent.getAbsolutePath()));
+ throw new SecurityException(
+
sm.getString("persistentProviderRegistrations.mkdirsFail",
configParent.getAbsolutePath()));
}
}
diff --git a/java/org/apache/catalina/core/ApplicationFilterFactory.java
b/java/org/apache/catalina/core/ApplicationFilterFactory.java
index fe5851bf90..052717e4e1 100644
--- a/java/org/apache/catalina/core/ApplicationFilterFactory.java
+++ b/java/org/apache/catalina/core/ApplicationFilterFactory.java
@@ -91,7 +91,7 @@ public final class ApplicationFilterFactory {
// Acquire the information we will need to match filter mappings
DispatcherType dispatcher = (DispatcherType)
request.getAttribute(Globals.DISPATCHER_TYPE_ATTR);
- String requestPath = FilterUtil.getRequestPath(request) ;
+ String requestPath = FilterUtil.getRequestPath(request);
String servletName = wrapper.getName();
diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 2502e1132b..665d15ff6a 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -167,7 +167,7 @@ public class AprLifecycleListener implements
LifecycleListener {
synchronized (lock) {
// Instance may get destroyed without ever being initialized
if (instanceInitialized) {
- referenceCount --;
+ referenceCount--;
}
if (referenceCount != 0) {
// Still being used
diff --git a/java/org/apache/catalina/manager/StatusTransformer.java
b/java/org/apache/catalina/manager/StatusTransformer.java
index bfc83dc006..ef17d077d0 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -486,7 +486,9 @@ public class StatusTransformer {
/**
* Return the connector name without the port, for auto port connectors.
+ *
* @param name the connector name
+ *
* @return the name without the port for the auto connectors
*/
protected static String getConnectorName(String name) {
diff --git a/java/org/apache/catalina/realm/JAASRealm.java
b/java/org/apache/catalina/realm/JAASRealm.java
index 483a7d88e4..edd19c5b13 100644
--- a/java/org/apache/catalina/realm/JAASRealm.java
+++ b/java/org/apache/catalina/realm/JAASRealm.java
@@ -603,7 +603,8 @@ public class JAASRealm extends RealmBase {
URL resource =
Thread.currentThread().getContextClassLoader().getResource(configFile);
Configuration config = null;
if (resource == null) {
- try (ConfigurationSource.Resource configFileResource =
ConfigFileLoader.getSource().getResource(configFile)) {
+ try (ConfigurationSource.Resource configFileResource =
+
ConfigFileLoader.getSource().getResource(configFile)) {
config =
constructor.newInstance(configFileResource.getURI());
this.jaasConfigurationLoaded = true;
} catch (IOException ioe) {
diff --git a/java/org/apache/catalina/realm/RealmBase.java
b/java/org/apache/catalina/realm/RealmBase.java
index 62dec92d97..e2e721500a 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -1206,7 +1206,7 @@ public abstract class RealmBase extends
LifecycleMBeanBase implements Realm {
*
* @param gssName The GSS name
* @param gssCredential the GSS credential of the principal
- * @param gssContext the established GSS context
+ * @param gssContext the established GSS context
*
* @return the principal associated with the given user name.
*/
@@ -1433,8 +1433,8 @@ public abstract class RealmBase extends
LifecycleMBeanBase implements Realm {
argIndex = args.length;
// Special case, allow for - filename to refer to stdin
- try (BufferedReader br = passwordFile.equals("-") ? new
BufferedReader(new InputStreamReader(System.in))
- : new BufferedReader(new FileReader(passwordFile))) {
+ try (BufferedReader br = passwordFile.equals("-") ? new
BufferedReader(new InputStreamReader(System.in)) :
+ new BufferedReader(new FileReader(passwordFile))) {
String line;
while ((line = br.readLine()) != null) {
// Mutate each line in the file, or stdin
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index f94edebaa0..0ea34b4f34 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -130,7 +130,6 @@ import org.xml.sax.SAXException;
* mapping configuration above, the context will be accessible to normal users
as before. Those users with the necessary
* access will be able to edit content available via
http://host:port/context/content using
* http://host:port/context/webdavedit/content
- *
* <p>
* There are some known limitations of this Servlet due to it not implementing
the PROPPATCH method. Details of these
* limitations and progress towards addressing them are being tracked under
diff --git a/java/org/apache/catalina/tribes/util/ExecutorFactory.java
b/java/org/apache/catalina/tribes/util/ExecutorFactory.java
index 2f2cdfdcc5..a2c64c168e 100644
--- a/java/org/apache/catalina/tribes/util/ExecutorFactory.java
+++ b/java/org/apache/catalina/tribes/util/ExecutorFactory.java
@@ -38,8 +38,8 @@ public class ExecutorFactory {
public static ExecutorService newThreadPool(int minThreads, int
maxThreads, long maxIdleTime, TimeUnit unit,
ThreadFactory threadFactory) {
TaskQueue taskqueue = new TaskQueue();
- ThreadPoolExecutor service = new TribesThreadPoolExecutor(minThreads,
maxThreads, maxIdleTime, unit, taskqueue,
- threadFactory);
+ ThreadPoolExecutor service =
+ new TribesThreadPoolExecutor(minThreads, maxThreads,
maxIdleTime, unit, taskqueue, threadFactory);
taskqueue.setParent(service);
return service;
}
diff --git a/java/org/apache/catalina/tribes/util/StringManager.java
b/java/org/apache/catalina/tribes/util/StringManager.java
index c3096263f7..d2b6623068 100644
--- a/java/org/apache/catalina/tribes/util/StringManager.java
+++ b/java/org/apache/catalina/tribes/util/StringManager.java
@@ -170,7 +170,7 @@ public class StringManager {
// STATIC SUPPORT METHODS
// --------------------------------------------------------------
- private static final Map<String, Map<Locale, StringManager>> managers =
new HashMap<>();
+ private static final Map<String,Map<Locale,StringManager>> managers = new
HashMap<>();
/**
@@ -210,7 +210,7 @@ public class StringManager {
*/
public static final synchronized StringManager getManager(String
packageName, Locale locale) {
- Map<Locale, StringManager> map = managers.get(packageName);
+ Map<Locale,StringManager> map = managers.get(packageName);
if (map == null) {
/*
* Don't want the HashMap size to exceed LOCALE_CACHE_SIZE.
Expansion occurs when size() exceeds capacity.
@@ -221,7 +221,7 @@ public class StringManager {
private static final long serialVersionUID = 1L;
@Override
- protected boolean removeEldestEntry(Map.Entry<Locale,
StringManager> eldest) {
+ protected boolean
removeEldestEntry(Map.Entry<Locale,StringManager> eldest) {
if (size() > (LOCALE_CACHE_SIZE - 1)) {
return true;
}
diff --git a/java/org/apache/coyote/AbstractProtocol.java
b/java/org/apache/coyote/AbstractProtocol.java
index b73b673d46..865167f35f 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -446,8 +446,8 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler, MBeanRegis
public void removeWaitingProcessor(Processor processor) {
boolean result = waitingProcessors.remove(processor);
if (getLog().isTraceEnabled()) {
- getLog().trace(sm.getString(
- "abstractProtocol.waitingProcessor.remove", processor,
Boolean.valueOf(result)));
+ getLog().trace(
+ sm.getString("abstractProtocol.waitingProcessor.remove",
processor, Boolean.valueOf(result)));
}
}
diff --git a/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
b/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
index a967ef65a8..debdf57ed8 100644
--- a/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
@@ -201,10 +201,10 @@ public class ChunkedInputFilter implements InputFilter,
ApplicationBufferHandler
// Handle some edge cases
if (available == 1 && parseState == ParseState.CHUNK_BODY_CRLF) {
- // Either just the CR or just the LF are left in the buffer.
There is no data to read.
+ // Either just the CR or just the LF are left in the buffer. There
is no data to read.
available = 0;
} else if (available == 2 && !crFound && parseState ==
ParseState.CHUNK_BODY_CRLF) {
- // Just CRLF is left in the buffer. There is no data to read.
+ // Just CRLF is left in the buffer. There is no data to read.
available = 0;
}
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index de0a69d2d5..6a496ca918 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1817,8 +1817,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
streams.put(original.getIdentifier(), replacement);
} else {
if (log.isTraceEnabled()) {
- log.trace(sm.getString(
- "upgradeHandler.replace.duplicate", getConnectionId(),
original.getIdAsString()));
+ log.trace(
+ sm.getString("upgradeHandler.replace.duplicate",
getConnectionId(), original.getIdAsString()));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
