This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new d30236d799 Code clean-up. Fix indenting. No functional change.
d30236d799 is described below
commit d30236d799a1199e6562a82509ecc8954c993ae0
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Jan 19 13:59:00 2023 +0000
Code clean-up. Fix indenting. No functional change.
---
java/javax/servlet/HttpConstraintElement.java | 3 +--
java/javax/servlet/HttpMethodConstraintElement.java | 3 +--
java/javax/servlet/ServletRequestWrapper.java | 3 +--
java/javax/servlet/ServletResponseWrapper.java | 3 +--
java/javax/servlet/ServletSecurityElement.java | 3 +--
java/javax/servlet/jsp/PageContext.java | 12 ++++--------
java/javax/servlet/jsp/el/ImplicitObjectELResolver.java | 4 +---
java/javax/servlet/jsp/tagext/DynamicAttributes.java | 5 +----
java/javax/servlet/jsp/tagext/SimpleTagSupport.java | 4 +---
java/javax/servlet/jsp/tagext/TagLibraryValidator.java | 3 +--
java/javax/servlet/jsp/tagext/TagSupport.java | 6 ++----
java/org/apache/catalina/ant/ValidatorTask.java | 3 +--
12 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/java/javax/servlet/HttpConstraintElement.java
b/java/javax/servlet/HttpConstraintElement.java
index 7e422bb0db..fd55c869be 100644
--- a/java/javax/servlet/HttpConstraintElement.java
+++ b/java/javax/servlet/HttpConstraintElement.java
@@ -30,8 +30,7 @@ import
javax.servlet.annotation.ServletSecurity.TransportGuarantee;
public class HttpConstraintElement {
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
- private static final ResourceBundle lStrings =
- ResourceBundle.getBundle(LSTRING_FILE);
+ private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private final EmptyRoleSemantic emptyRoleSemantic;// =
EmptyRoleSemantic.PERMIT;
private final TransportGuarantee transportGuarantee;// =
TransportGuarantee.NONE;
diff --git a/java/javax/servlet/HttpMethodConstraintElement.java
b/java/javax/servlet/HttpMethodConstraintElement.java
index 97bd9fc487..7645856b2f 100644
--- a/java/javax/servlet/HttpMethodConstraintElement.java
+++ b/java/javax/servlet/HttpMethodConstraintElement.java
@@ -28,8 +28,7 @@ public class HttpMethodConstraintElement extends
HttpConstraintElement {
// Can't inherit from HttpConstraintElement as API does not allow it
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
- private static final ResourceBundle lStrings =
- ResourceBundle.getBundle(LSTRING_FILE);
+ private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private final String methodName;
diff --git a/java/javax/servlet/ServletRequestWrapper.java
b/java/javax/servlet/ServletRequestWrapper.java
index cf3b2d26a0..71d4aa91b1 100644
--- a/java/javax/servlet/ServletRequestWrapper.java
+++ b/java/javax/servlet/ServletRequestWrapper.java
@@ -35,8 +35,7 @@ import java.util.ResourceBundle;
*/
public class ServletRequestWrapper implements ServletRequest {
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
- private static final ResourceBundle lStrings =
- ResourceBundle.getBundle(LSTRING_FILE);
+ private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private ServletRequest request;
diff --git a/java/javax/servlet/ServletResponseWrapper.java
b/java/javax/servlet/ServletResponseWrapper.java
index 4c4829862d..da9264a26d 100644
--- a/java/javax/servlet/ServletResponseWrapper.java
+++ b/java/javax/servlet/ServletResponseWrapper.java
@@ -32,8 +32,7 @@ import java.util.ResourceBundle;
*/
public class ServletResponseWrapper implements ServletResponse {
private static final String LSTRING_FILE = "javax.servlet.LocalStrings";
- private static final ResourceBundle lStrings =
- ResourceBundle.getBundle(LSTRING_FILE);
+ private static final ResourceBundle lStrings =
ResourceBundle.getBundle(LSTRING_FILE);
private ServletResponse response;
diff --git a/java/javax/servlet/ServletSecurityElement.java
b/java/javax/servlet/ServletSecurityElement.java
index d0bfa5ba03..9b4821f893 100644
--- a/java/javax/servlet/ServletSecurityElement.java
+++ b/java/javax/servlet/ServletSecurityElement.java
@@ -35,8 +35,7 @@ import javax.servlet.annotation.ServletSecurity;
*/
public class ServletSecurityElement extends HttpConstraintElement {
- private final Map<String,HttpMethodConstraintElement> methodConstraints =
- new HashMap<>();
+ private final Map<String,HttpMethodConstraintElement> methodConstraints =
new HashMap<>();
/**
* Use default HttpConstraint.
diff --git a/java/javax/servlet/jsp/PageContext.java
b/java/javax/servlet/jsp/PageContext.java
index 1a6cc98e4c..9d8d7ecdbd 100644
--- a/java/javax/servlet/jsp/PageContext.java
+++ b/java/javax/servlet/jsp/PageContext.java
@@ -88,10 +88,7 @@ import javax.servlet.jsp.tagext.BodyContent;
* <code>forward()</code>, <code>include()</code>,
* and <code>handlePageException()</code>.
*/
-
-public abstract class PageContext
- extends JspContext
-{
+public abstract class PageContext extends JspContext {
/**
* Sole constructor. (For invocation by subclass constructors,
@@ -221,10 +218,9 @@ public abstract class PageContext
* is invalid
*/
- public abstract void initialize(Servlet servlet, ServletRequest request,
- ServletResponse response, String errorPageURL, boolean needsSession,
- int bufferSize, boolean autoFlush)
- throws IOException, IllegalStateException, IllegalArgumentException;
+ public abstract void initialize(Servlet servlet, ServletRequest request,
ServletResponse response,
+ String errorPageURL, boolean needsSession, int bufferSize, boolean
autoFlush)
+ throws IOException, IllegalStateException,
IllegalArgumentException;
/**
* <p>
diff --git a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
index 7fe036e434..f4aa158486 100644
--- a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -316,9 +316,7 @@ public class ImplicitObjectELResolver extends ELResolver {
@Override
protected String[] getAttribute(String name) {
- Enumeration<String> e =
- ((HttpServletRequest) page.getRequest())
- .getHeaders(name);
+ Enumeration<String> e = ((HttpServletRequest)
page.getRequest()).getHeaders(name);
if (e != null) {
List<String> list = new ArrayList<>();
while (e.hasMoreElements()) {
diff --git a/java/javax/servlet/jsp/tagext/DynamicAttributes.java
b/java/javax/servlet/jsp/tagext/DynamicAttributes.java
index 0b05f9cea6..36162ff056 100644
--- a/java/javax/servlet/jsp/tagext/DynamicAttributes.java
+++ b/java/javax/servlet/jsp/tagext/DynamicAttributes.java
@@ -45,8 +45,5 @@ public interface DynamicAttributes {
* signal that it does not accept the given attribute. The
* container must not call doStartTag() or doTag() for this tag.
*/
- public void setDynamicAttribute(
- String uri, String localName, Object value )
- throws JspException;
-
+ public void setDynamicAttribute(String uri, String localName, Object
value) throws JspException;
}
diff --git a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
index 27c6bf27cd..47a37d4ede 100644
--- a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
+++ b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java
@@ -179,9 +179,7 @@ public class SimpleTagSupport implements SimpleTag {
* @return the nearest ancestor that implements the interface
* or is an instance of the class specified
*/
- public static final JspTag findAncestorWithClass(
- JspTag from, Class<?> klass)
- {
+ public static final JspTag findAncestorWithClass(JspTag from, Class<?>
klass) {
boolean isInterface = false;
if (from == null || klass == null ||
(!JspTag.class.isAssignableFrom(klass) &&
diff --git a/java/javax/servlet/jsp/tagext/TagLibraryValidator.java
b/java/javax/servlet/jsp/tagext/TagLibraryValidator.java
index 189687aa25..5d57e5b888 100644
--- a/java/javax/servlet/jsp/tagext/TagLibraryValidator.java
+++ b/java/javax/servlet/jsp/tagext/TagLibraryValidator.java
@@ -127,8 +127,7 @@ public abstract class TagLibraryValidator {
* @return A null object, or zero length array if no errors, an array
* of ValidationMessages otherwise.
*/
- public ValidationMessage[] validate(String prefix, String uri,
- PageData page) {
+ public ValidationMessage[] validate(String prefix, String uri, PageData
page) {
return null;
}
diff --git a/java/javax/servlet/jsp/tagext/TagSupport.java
b/java/javax/servlet/jsp/tagext/TagSupport.java
index 7f722ac91b..d28165bbd2 100644
--- a/java/javax/servlet/jsp/tagext/TagSupport.java
+++ b/java/javax/servlet/jsp/tagext/TagSupport.java
@@ -81,10 +81,8 @@ public class TagSupport implements IterationTag,
Serializable {
Class klass) {
boolean isInterface = false;
- if (from == null ||
- klass == null ||
- (!Tag.class.isAssignableFrom(klass) &&
- !(isInterface = klass.isInterface()))) {
+ if (from == null || klass == null ||
+ (!Tag.class.isAssignableFrom(klass) && !(isInterface =
klass.isInterface()))) {
return null;
}
diff --git a/java/org/apache/catalina/ant/ValidatorTask.java
b/java/org/apache/catalina/ant/ValidatorTask.java
index d239684d3e..fbe360dd0a 100644
--- a/java/org/apache/catalina/ant/ValidatorTask.java
+++ b/java/org/apache/catalina/ant/ValidatorTask.java
@@ -82,8 +82,7 @@ public class ValidatorTask extends BaseRedirectorHelperTask {
// Commons-logging likes having the context classloader set
ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader
- (ValidatorTask.class.getClassLoader());
+
Thread.currentThread().setContextClassLoader(ValidatorTask.class.getClassLoader());
// Called through trusted manager interface. If running under a
// SecurityManager assume that untrusted applications may be deployed.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
