This is an automated email from the ASF dual-hosted git repository.
rjung pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 7773972 Fix validation error: ModifierOrder.
7773972 is described below
commit 77739727ff24e41cb464a6c32ef2a0966786ad0a
Author: Rainer Jung <[email protected]>
AuthorDate: Fri Dec 4 14:40:08 2020 +0100
Fix validation error: ModifierOrder.
'abstract' modifier out of order with the JLS suggestions.
Followup to fe36ceef496d1b59dd8d133a62ad213f48474969.
No functional change.
---
java/org/apache/catalina/ssi/ExpressionParseTree.java | 4 ++--
java/org/apache/catalina/valves/rewrite/Substitution.java | 2 +-
java/org/apache/tomcat/websocket/WsFrameBase.java | 2 +-
test/org/apache/catalina/authenticator/TestFormAuthenticator.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/ssi/ExpressionParseTree.java
b/java/org/apache/catalina/ssi/ExpressionParseTree.java
index 83da544..dd048c0 100644
--- a/java/org/apache/catalina/ssi/ExpressionParseTree.java
+++ b/java/org/apache/catalina/ssi/ExpressionParseTree.java
@@ -213,7 +213,7 @@ public class ExpressionParseTree {
/**
* A node in the expression parse tree.
*/
- private static abstract class Node {
+ private abstract static class Node {
/**
* @return {@code true} if the node evaluates to true.
*/
@@ -266,7 +266,7 @@ public class ExpressionParseTree {
/**
* A node implementation that represents an operation.
*/
- private static abstract class OppNode extends Node {
+ private abstract static class OppNode extends Node {
/**
* The left branch.
*/
diff --git a/java/org/apache/catalina/valves/rewrite/Substitution.java
b/java/org/apache/catalina/valves/rewrite/Substitution.java
index 26fc210..50d78db 100644
--- a/java/org/apache/catalina/valves/rewrite/Substitution.java
+++ b/java/org/apache/catalina/valves/rewrite/Substitution.java
@@ -25,7 +25,7 @@ import org.apache.catalina.util.URLEncoder;
public class Substitution {
- public static abstract class SubstitutionElement {
+ public abstract static class SubstitutionElement {
public abstract String evaluate(Matcher rule, Matcher cond, Resolver
resolver);
}
diff --git a/java/org/apache/tomcat/websocket/WsFrameBase.java
b/java/org/apache/tomcat/websocket/WsFrameBase.java
index 5779308..615dd31 100644
--- a/java/org/apache/tomcat/websocket/WsFrameBase.java
+++ b/java/org/apache/tomcat/websocket/WsFrameBase.java
@@ -912,7 +912,7 @@ public abstract class WsFrameBase {
protected abstract void resumeProcessing();
- private static abstract class TerminalTransformation implements
Transformation {
+ private abstract static class TerminalTransformation implements
Transformation {
@Override
public boolean validateRsvBits(int i) {
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
index 2a5f346..c332be1 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -418,7 +418,7 @@ public class TestFormAuthenticator extends TomcatBaseTest {
* Encapsulate the logic needed to run a suitably-configured tomcat
* instance, send it an HTTP request and process the server response
*/
- private static abstract class FormAuthClientBase extends SimpleHttpClient {
+ private abstract static class FormAuthClientBase extends SimpleHttpClient {
protected static final String LOGIN_PARAM_TAG = "action=";
protected static final String LOGIN_RESOURCE = "j_security_check";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
