(tomcat) 02/04: Code clean-up - formatting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1b7f7cf931ae551ce096cba4150111b123096d40
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:00:34 2024 +0100
Code clean-up - formatting. No functional change.
---
.DS_Store | Bin 0 -> 6148 bytes
java/org/apache/catalina/tribes/ByteMessage.java | 31 +-
java/org/apache/catalina/tribes/Channel.java | 311 -
.../apache/catalina/tribes/ChannelException.java | 59 ++--
.../apache/catalina/tribes/ChannelInterceptor.java | 130 +
.../apache/catalina/tribes/ChannelListener.java| 15 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 32 ++-
.../apache/catalina/tribes/ChannelReceiver.java| 20 +-
java/org/apache/catalina/tribes/ChannelSender.java | 31 +-
java/org/apache/catalina/tribes/ErrorHandler.java | 11 +-
java/org/apache/catalina/tribes/Heartbeat.java | 4 +-
java/org/apache/catalina/tribes/JmxChannel.java| 6 +
.../org/apache/catalina/tribes/ManagedChannel.java | 18 +-
java/org/apache/catalina/tribes/Member.java| 66 +++--
.../apache/catalina/tribes/MembershipListener.java | 8 +-
.../apache/catalina/tribes/MembershipProvider.java | 32 ++-
.../apache/catalina/tribes/MembershipService.java | 63 +++--
.../apache/catalina/tribes/MessageListener.java| 6 +-
.../catalina/tribes/RemoteProcessException.java| 4 +-
java/org/apache/catalina/tribes/UniqueId.java | 20 +-
20 files changed, 525 insertions(+), 342 deletions(-)
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00..1b83a3bed8
Binary files /dev/null and b/.DS_Store differ
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java
b/java/org/apache/catalina/tribes/ByteMessage.java
index bf3c4269a3..5afa7da900 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -22,21 +22,17 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
/**
- * A byte message is not serialized and deserialized by the channel
- * instead it is sent as a byte array.
+ * A byte message is not serialized and deserialized by the channel instead it
is sent as a byte array.
*
- * By default Tribes uses java serialization when it receives an object
- * to be sent over the wire. Java serialization is not the most
- * efficient of serializing data, and Tribes might not even
- * have access to the correct class loaders to deserialize the object properly.
+ * By default Tribes uses java serialization when it receives an object to be
sent over the wire. Java serialization is
+ * not the most efficient of serializing data, and Tribes might not even have
access to the correct class loaders to
+ * deserialize the object properly.
*
- * The ByteMessage class is a class where the channel when it receives it will
- * not attempt to perform serialization, instead it will simply stream the
getMessage()
- * bytes.
+ * The ByteMessage class is a class where the channel when it receives it will
not attempt to perform serialization,
+ * instead it will simply stream the getMessage() bytes.
*
- * If you are using multiple applications on top of Tribes you should add some
sort of header
- * so that you can decide with the ChannelListener.accept()
whether this message was intended
- * for you.
+ * If you are using multiple applications on top of Tribes you should add some
sort of header so that you can decide
+ * with the ChannelListener.accept() whether this message was
intended for you.
*/
public class ByteMessage implements Externalizable {
/**
@@ -55,6 +51,7 @@ public class ByteMessage implements Externalizable {
/**
* Creates a byte message with
+ *
* @param data byte[] - the message contents
*/
public ByteMessage(byte[] data) {
@@ -63,6 +60,7 @@ public class ByteMessage implements Externalizable {
/**
* Returns the message contents of this byte message
+ *
* @return byte[] - message contents, can be null
*/
public byte[] getMessage() {
@@ -71,6 +69,7 @@ public class ByteMessage implements Externalizable {
/**
* Sets the message contents of this byte message
+ *
* @param message byte[]
*/
public void setMessage(byte[] message) {
@@ -78,7 +77,7 @@ public class ByteMessage implements Externalizable {
}
@Override
-public void readExternal(ObjectInput in ) throws IOException {
+public void readExternal(ObjectInput in) throws IOException {
int length = in.readInt();
message = new byte[length];
in.readFully(message);
@@ -86,9 +85,9 @@ public class ByteMessage implements Externalizable {
@Override
public void writeExternal(ObjectOutput out) throws IOException {
-out.writeInt(message!=null?message.len
(tomcat) 02/04: Code clean-up - formatting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 9faa87378cb08943a56c255571823c1a3424196b
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:00:34 2024 +0100
Code clean-up - formatting. No functional change.
---
.DS_Store | Bin 0 -> 6148 bytes
java/org/apache/catalina/tribes/ByteMessage.java | 31 +-
java/org/apache/catalina/tribes/Channel.java | 311 -
.../apache/catalina/tribes/ChannelException.java | 59 ++--
.../apache/catalina/tribes/ChannelInterceptor.java | 130 +
.../apache/catalina/tribes/ChannelListener.java| 15 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 32 ++-
.../apache/catalina/tribes/ChannelReceiver.java| 20 +-
java/org/apache/catalina/tribes/ChannelSender.java | 31 +-
java/org/apache/catalina/tribes/ErrorHandler.java | 11 +-
java/org/apache/catalina/tribes/Heartbeat.java | 4 +-
java/org/apache/catalina/tribes/JmxChannel.java| 6 +
.../org/apache/catalina/tribes/ManagedChannel.java | 18 +-
java/org/apache/catalina/tribes/Member.java| 66 +++--
.../apache/catalina/tribes/MembershipListener.java | 8 +-
.../apache/catalina/tribes/MembershipProvider.java | 32 ++-
.../apache/catalina/tribes/MembershipService.java | 63 +++--
.../apache/catalina/tribes/MessageListener.java| 6 +-
.../catalina/tribes/RemoteProcessException.java| 4 +-
java/org/apache/catalina/tribes/UniqueId.java | 20 +-
20 files changed, 525 insertions(+), 342 deletions(-)
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00..1b83a3bed8
Binary files /dev/null and b/.DS_Store differ
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java
b/java/org/apache/catalina/tribes/ByteMessage.java
index bf3c4269a3..5afa7da900 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -22,21 +22,17 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
/**
- * A byte message is not serialized and deserialized by the channel
- * instead it is sent as a byte array.
+ * A byte message is not serialized and deserialized by the channel instead it
is sent as a byte array.
*
- * By default Tribes uses java serialization when it receives an object
- * to be sent over the wire. Java serialization is not the most
- * efficient of serializing data, and Tribes might not even
- * have access to the correct class loaders to deserialize the object properly.
+ * By default Tribes uses java serialization when it receives an object to be
sent over the wire. Java serialization is
+ * not the most efficient of serializing data, and Tribes might not even have
access to the correct class loaders to
+ * deserialize the object properly.
*
- * The ByteMessage class is a class where the channel when it receives it will
- * not attempt to perform serialization, instead it will simply stream the
getMessage()
- * bytes.
+ * The ByteMessage class is a class where the channel when it receives it will
not attempt to perform serialization,
+ * instead it will simply stream the getMessage() bytes.
*
- * If you are using multiple applications on top of Tribes you should add some
sort of header
- * so that you can decide with the ChannelListener.accept()
whether this message was intended
- * for you.
+ * If you are using multiple applications on top of Tribes you should add some
sort of header so that you can decide
+ * with the ChannelListener.accept() whether this message was
intended for you.
*/
public class ByteMessage implements Externalizable {
/**
@@ -55,6 +51,7 @@ public class ByteMessage implements Externalizable {
/**
* Creates a byte message with
+ *
* @param data byte[] - the message contents
*/
public ByteMessage(byte[] data) {
@@ -63,6 +60,7 @@ public class ByteMessage implements Externalizable {
/**
* Returns the message contents of this byte message
+ *
* @return byte[] - message contents, can be null
*/
public byte[] getMessage() {
@@ -71,6 +69,7 @@ public class ByteMessage implements Externalizable {
/**
* Sets the message contents of this byte message
+ *
* @param message byte[]
*/
public void setMessage(byte[] message) {
@@ -78,7 +77,7 @@ public class ByteMessage implements Externalizable {
}
@Override
-public void readExternal(ObjectInput in ) throws IOException {
+public void readExternal(ObjectInput in) throws IOException {
int length = in.readInt();
message = new byte[length];
in.readFully(message);
@@ -86,9 +85,9 @@ public class ByteMessage implements Externalizable {
@Override
public void writeExternal(ObjectOutput out) throws IOException {
-out.writeInt(message!=null?message.le
(tomcat) 02/04: Code clean-up - formatting. No functional change.
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 51b9cd00e692f74767d7b98be1978a79b3545f6b
Author: Mark Thomas
AuthorDate: Wed Oct 2 11:00:34 2024 +0100
Code clean-up - formatting. No functional change.
---
.DS_Store | Bin 0 -> 6148 bytes
java/org/apache/catalina/tribes/ByteMessage.java | 31 +-
java/org/apache/catalina/tribes/Channel.java | 311 -
.../apache/catalina/tribes/ChannelException.java | 59 ++--
.../apache/catalina/tribes/ChannelInterceptor.java | 130 +
.../apache/catalina/tribes/ChannelListener.java| 15 +-
.../org/apache/catalina/tribes/ChannelMessage.java | 32 ++-
.../apache/catalina/tribes/ChannelReceiver.java| 20 +-
java/org/apache/catalina/tribes/ChannelSender.java | 31 +-
java/org/apache/catalina/tribes/ErrorHandler.java | 11 +-
java/org/apache/catalina/tribes/Heartbeat.java | 4 +-
java/org/apache/catalina/tribes/JmxChannel.java| 6 +
.../org/apache/catalina/tribes/ManagedChannel.java | 18 +-
java/org/apache/catalina/tribes/Member.java| 66 +++--
.../apache/catalina/tribes/MembershipListener.java | 8 +-
.../apache/catalina/tribes/MembershipProvider.java | 32 ++-
.../apache/catalina/tribes/MembershipService.java | 63 +++--
.../apache/catalina/tribes/MessageListener.java| 6 +-
.../catalina/tribes/RemoteProcessException.java| 4 +-
java/org/apache/catalina/tribes/UniqueId.java | 20 +-
20 files changed, 525 insertions(+), 342 deletions(-)
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00..1b83a3bed8
Binary files /dev/null and b/.DS_Store differ
diff --git a/java/org/apache/catalina/tribes/ByteMessage.java
b/java/org/apache/catalina/tribes/ByteMessage.java
index bf3c4269a3..5afa7da900 100644
--- a/java/org/apache/catalina/tribes/ByteMessage.java
+++ b/java/org/apache/catalina/tribes/ByteMessage.java
@@ -22,21 +22,17 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
/**
- * A byte message is not serialized and deserialized by the channel
- * instead it is sent as a byte array.
+ * A byte message is not serialized and deserialized by the channel instead it
is sent as a byte array.
*
- * By default Tribes uses java serialization when it receives an object
- * to be sent over the wire. Java serialization is not the most
- * efficient of serializing data, and Tribes might not even
- * have access to the correct class loaders to deserialize the object properly.
+ * By default Tribes uses java serialization when it receives an object to be
sent over the wire. Java serialization is
+ * not the most efficient of serializing data, and Tribes might not even have
access to the correct class loaders to
+ * deserialize the object properly.
*
- * The ByteMessage class is a class where the channel when it receives it will
- * not attempt to perform serialization, instead it will simply stream the
getMessage()
- * bytes.
+ * The ByteMessage class is a class where the channel when it receives it will
not attempt to perform serialization,
+ * instead it will simply stream the getMessage() bytes.
*
- * If you are using multiple applications on top of Tribes you should add some
sort of header
- * so that you can decide with the ChannelListener.accept()
whether this message was intended
- * for you.
+ * If you are using multiple applications on top of Tribes you should add some
sort of header so that you can decide
+ * with the ChannelListener.accept() whether this message was
intended for you.
*/
public class ByteMessage implements Externalizable {
/**
@@ -55,6 +51,7 @@ public class ByteMessage implements Externalizable {
/**
* Creates a byte message with
+ *
* @param data byte[] - the message contents
*/
public ByteMessage(byte[] data) {
@@ -63,6 +60,7 @@ public class ByteMessage implements Externalizable {
/**
* Returns the message contents of this byte message
+ *
* @return byte[] - message contents, can be null
*/
public byte[] getMessage() {
@@ -71,6 +69,7 @@ public class ByteMessage implements Externalizable {
/**
* Sets the message contents of this byte message
+ *
* @param message byte[]
*/
public void setMessage(byte[] message) {
@@ -78,7 +77,7 @@ public class ByteMessage implements Externalizable {
}
@Override
-public void readExternal(ObjectInput in ) throws IOException {
+public void readExternal(ObjectInput in) throws IOException {
int length = in.readInt();
message = new byte[length];
in.readFully(message);
@@ -86,9 +85,9 @@ public class ByteMessage implements Externalizable {
@Override
public void writeExternal(ObjectOutput out) throws IOException {
-out.writeInt(message!=null?message.le
(tomcat) 02/04: Code clean-up - formatting. No functional change.
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
commit 7151eaa7ec1c2e43a9fd88de006765c911b0ea0e
Author: Mark Thomas
AuthorDate: Fri May 3 08:06:47 2024 +0100
Code clean-up - formatting. No functional change.
---
java/jakarta/servlet/http/HttpServletRequest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/jakarta/servlet/http/HttpServletRequest.java
b/java/jakarta/servlet/http/HttpServletRequest.java
index 8e36a97ccd..277bc32fbc 100644
--- a/java/jakarta/servlet/http/HttpServletRequest.java
+++ b/java/jakarta/servlet/http/HttpServletRequest.java
@@ -511,8 +511,7 @@ public interface HttpServletRequest extends ServletRequest {
*
* @since Servlet 3.1
*/
- T upgrade(Class httpUpgradeHandlerClass)
-throws IOException, ServletException;
+ T upgrade(Class httpUpgradeHandlerClass)
throws IOException, ServletException;
/**
* Obtain a Map of the trailer fields that is not backed by the request
object.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/04: Code clean-up - formatting. No functional change.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 38b2243ef277b52339cabb3dd808013400a4b8a2
Author: Mark Thomas
AuthorDate: Wed Jun 14 12:15:09 2023 +0100
Code clean-up - formatting. No functional change.
---
.../apache/catalina/core/ApplicationContext.java | 20 ++---
.../catalina/core/ApplicationContextFacade.java| 12 +--
.../catalina/core/ApplicationDispatcher.java | 8 +-
.../catalina/core/ApplicationFilterChain.java | 8 +-
.../catalina/core/ApplicationFilterConfig.java | 6 +-
.../catalina/core/ApplicationFilterFactory.java| 8 +-
.../core/ApplicationFilterRegistration.java| 10 +--
.../catalina/core/ApplicationHttpRequest.java | 20 ++---
java/org/apache/catalina/core/ApplicationPart.java | 2 +-
.../catalina/core/ApplicationPushBuilder.java | 8 +-
.../apache/catalina/core/ApplicationRequest.java | 16 ++--
.../core/ApplicationServletRegistration.java | 10 +--
.../core/ApplicationSessionCookieConfig.java | 6 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 4 +-
java/org/apache/catalina/core/ContainerBase.java | 2 +-
.../catalina/core/ContextNamingInfoListener.java | 13 ++--
.../catalina/core/DefaultInstanceManager.java | 38 +-
.../apache/catalina/core/FrameworkListener.java| 2 +-
.../core/JreMemoryLeakPreventionListener.java | 5 +-
.../catalina/core/NamingContextListener.java | 12 +--
java/org/apache/catalina/core/StandardContext.java | 86 +++---
java/org/apache/catalina/core/StandardHost.java| 8 +-
java/org/apache/catalina/core/StandardServer.java | 9 +--
java/org/apache/catalina/core/StandardWrapper.java | 4 +-
24 files changed, 159 insertions(+), 158 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index de2fd12cd7..691ce5acc6 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -113,13 +113,13 @@ public class ApplicationContext implements ServletContext
{
/**
* The context attributes for this context.
*/
-protected Map attributes = new ConcurrentHashMap<>();
+protected Map attributes = new ConcurrentHashMap<>();
/**
* List of read only attributes for this context.
*/
-private final Map readOnlyAttributes = new
ConcurrentHashMap<>();
+private final Map readOnlyAttributes = new
ConcurrentHashMap<>();
/**
@@ -143,7 +143,7 @@ public class ApplicationContext implements ServletContext {
/**
* The merged context initialization parameters for this Context.
*/
-private final Map parameters = new ConcurrentHashMap<>();
+private final Map parameters = new ConcurrentHashMap<>();
/**
@@ -799,7 +799,7 @@ public class ApplicationContext implements ServletContext {
}
String jspServletClassName = null;
-Map jspFileInitParams = new HashMap<>();
+Map jspFileInitParams = new HashMap<>();
Wrapper jspServlet = (Wrapper) context.findChild("jsp");
@@ -826,7 +826,7 @@ public class ApplicationContext implements ServletContext {
private ServletRegistration.Dynamic addServlet(String servletName, String
servletClass, Servlet servlet,
-Map initParams) throws IllegalStateException {
+Map initParams) throws IllegalStateException {
if (servletName == null || servletName.equals("")) {
throw new
IllegalArgumentException(sm.getString("applicationContext.invalidServletName",
servletName));
@@ -869,7 +869,7 @@ public class ApplicationContext implements ServletContext {
}
if (initParams != null) {
-for (Map.Entry initParam : initParams.entrySet()) {
+for (Map.Entry initParam : initParams.entrySet()) {
wrapper.addInitParameter(initParam.getKey(),
initParam.getValue());
}
}
@@ -1136,8 +1136,8 @@ public class ApplicationContext implements ServletContext
{
@Override
-public Map getFilterRegistrations() {
-Map result = new HashMap<>();
+public Map getFilterRegistrations() {
+Map result = new HashMap<>();
FilterDef[] filterDefs = context.findFilterDefs();
for (FilterDef filterDef : filterDefs) {
@@ -1155,8 +1155,8 @@ public class ApplicationContext implements ServletContext
{
@Override
-public Map
getServletRegistrations() {
-Map result = new HashMap<>();
+public Map getServletRegistrations()
{
+Map result = new HashMap<>();
Container[] wrappers = context.findChildren();
for (Container wrapper : wrappers) {
diff --git a/java/org/apache/catalina/core/ApplicationContextFacade.java
b/java/org/apache/catalina/c
[tomcat] 02/04: Code clean-up - formatting. No functional change.
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
commit b8e6d382c61c9ea250b082bbe70d4f85ef804928
Author: Mark Thomas
AuthorDate: Wed Jun 14 11:59:33 2023 +0100
Code clean-up - formatting. No functional change.
---
.../apache/catalina/core/ApplicationContext.java | 20 ++---
.../catalina/core/ApplicationContextFacade.java| 6 +-
.../catalina/core/ApplicationDispatcher.java | 8 +-
.../catalina/core/ApplicationFilterConfig.java | 6 +-
.../catalina/core/ApplicationFilterFactory.java| 8 +-
.../core/ApplicationFilterRegistration.java| 10 +--
.../catalina/core/ApplicationHttpRequest.java | 20 ++---
java/org/apache/catalina/core/ApplicationPart.java | 2 +-
.../catalina/core/ApplicationPushBuilder.java | 8 +-
.../apache/catalina/core/ApplicationRequest.java | 16 ++--
.../core/ApplicationServletRegistration.java | 10 +--
.../core/ApplicationSessionCookieConfig.java | 6 +-
.../org/apache/catalina/core/AsyncContextImpl.java | 4 +-
java/org/apache/catalina/core/ContainerBase.java | 2 +-
.../catalina/core/ContextNamingInfoListener.java | 13 ++--
.../catalina/core/DefaultInstanceManager.java | 38 +-
.../apache/catalina/core/FrameworkListener.java| 2 +-
.../core/JreMemoryLeakPreventionListener.java | 5 +-
.../catalina/core/NamingContextListener.java | 12 +--
java/org/apache/catalina/core/StandardContext.java | 86 +++---
java/org/apache/catalina/core/StandardHost.java| 8 +-
java/org/apache/catalina/core/StandardServer.java | 9 +--
java/org/apache/catalina/core/StandardWrapper.java | 4 +-
23 files changed, 152 insertions(+), 151 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index a04a7706b0..682ccc123b 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -113,13 +113,13 @@ public class ApplicationContext implements ServletContext
{
/**
* The context attributes for this context.
*/
-protected Map attributes = new ConcurrentHashMap<>();
+protected Map attributes = new ConcurrentHashMap<>();
/**
* List of read only attributes for this context.
*/
-private final Map readOnlyAttributes = new
ConcurrentHashMap<>();
+private final Map readOnlyAttributes = new
ConcurrentHashMap<>();
/**
@@ -143,7 +143,7 @@ public class ApplicationContext implements ServletContext {
/**
* The merged context initialization parameters for this Context.
*/
-private final Map parameters = new ConcurrentHashMap<>();
+private final Map parameters = new ConcurrentHashMap<>();
/**
@@ -799,7 +799,7 @@ public class ApplicationContext implements ServletContext {
}
String jspServletClassName = null;
-Map jspFileInitParams = new HashMap<>();
+Map jspFileInitParams = new HashMap<>();
Wrapper jspServlet = (Wrapper) context.findChild("jsp");
@@ -826,7 +826,7 @@ public class ApplicationContext implements ServletContext {
private ServletRegistration.Dynamic addServlet(String servletName, String
servletClass, Servlet servlet,
-Map initParams) throws IllegalStateException {
+Map initParams) throws IllegalStateException {
if (servletName == null || servletName.equals("")) {
throw new
IllegalArgumentException(sm.getString("applicationContext.invalidServletName",
servletName));
@@ -869,7 +869,7 @@ public class ApplicationContext implements ServletContext {
}
if (initParams != null) {
-for (Map.Entry initParam : initParams.entrySet()) {
+for (Map.Entry initParam : initParams.entrySet()) {
wrapper.addInitParameter(initParam.getKey(),
initParam.getValue());
}
}
@@ -1121,8 +1121,8 @@ public class ApplicationContext implements ServletContext
{
@Override
-public Map getFilterRegistrations() {
-Map result = new HashMap<>();
+public Map getFilterRegistrations() {
+Map result = new HashMap<>();
FilterDef[] filterDefs = context.findFilterDefs();
for (FilterDef filterDef : filterDefs) {
@@ -1140,8 +1140,8 @@ public class ApplicationContext implements ServletContext
{
@Override
-public Map
getServletRegistrations() {
-Map result = new HashMap<>();
+public Map getServletRegistrations()
{
+Map result = new HashMap<>();
Container[] wrappers = context.findChildren();
for (Container wrapper : wrappers) {
diff --git a/java/org/apache/catalina/core/ApplicationContextFacade.java
b/java/org/apache/catalina/core/ApplicationContextFacade.java
index 260eaa91fd..24678d8782
