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
commit d89b6b264c533219da780923900e5f770508ff1d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 16 17:21:31 2020 +0100
Fix spelling in coyote, el, jasper and naming
Based on a PR provided by John Bampton
i18n keys, local variables, Javadoc and private methods and private
classes - changes are low risk
There is one change to a public class (o.a.el.util.JreCompat) but that
is effectively an internal API so I think it is safe to make.
---
java/org/apache/coyote/AsyncStateMachine.java | 2 +-
java/org/apache/el/Messages.properties | 2 +-
java/org/apache/el/parser/AstFunction.java | 4 ++--
java/org/apache/el/util/Jre9Compat.java | 2 +-
java/org/apache/el/util/JreCompat.java | 2 +-
java/org/apache/el/util/ReflectionUtil.java | 2 +-
java/org/apache/jasper/compiler/ELParser.java | 2 +-
java/org/apache/jasper/compiler/Generator.java | 2 +-
java/org/apache/naming/StringManager.java | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/coyote/AsyncStateMachine.java
b/java/org/apache/coyote/AsyncStateMachine.java
index d4b274e..bf32bf9 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -60,7 +60,7 @@ import org.apache.tomcat.util.security.PrivilegedSetTccl;
* DISPATCHING - The dispatch is being processed.
* MUST_ERROR - ServletRequest.startAsync() has been called from
* Servlet.service() but, before service() exited, an I/O
- * error occured on another thread. The container will
+ * error occurred on another thread. The container will
* perform the necessary error handling when
* Servlet.service() exits.
* ERROR - Something went wrong.
diff --git a/java/org/apache/el/Messages.properties
b/java/org/apache/el/Messages.properties
index c24ded6..fbce247 100644
--- a/java/org/apache/el/Messages.properties
+++ b/java/org/apache/el/Messages.properties
@@ -53,7 +53,7 @@ error.fnMapper.paramcount=Function [{0}] specifies [{1}]
params, but [{2}] were
error.context.null=ELContext was null
# Parser
-error.funciton.tooManyMethodParameterSets=There are multiple sets of
parameters specified for function [{0}]
+error.function.tooManyMethodParameterSets=There are multiple sets of
parameters specified for function [{0}]
error.identifier.notjava=The identifier [{0}] is not a valid Java identifier
as required by section 1.19 of the EL specification (Identifier ::= Java
language identifier). This check can be disabled by setting the system property
org.apache.el.parser.SKIP_IDENTIFIER_CHECK to true.
error.lambda.tooManyMethodParameterSets=There are more sets of method
parameters specified than there are nested lambda expressions
diff --git a/java/org/apache/el/parser/AstFunction.java
b/java/org/apache/el/parser/AstFunction.java
index 09ac424..d445da5 100644
--- a/java/org/apache/el/parser/AstFunction.java
+++ b/java/org/apache/el/parser/AstFunction.java
@@ -104,7 +104,7 @@ public final class AstFunction extends SimpleNode {
if (varMapper != null) {
obj = varMapper.resolveVariable(this.localName);
if (obj instanceof ValueExpression) {
- // See if this returns a LambdaEXpression
+ // See if this returns a LambdaExpression
obj = ((ValueExpression) obj).getValue(ctx);
}
}
@@ -153,7 +153,7 @@ public final class AstFunction extends SimpleNode {
// single set of method parameters
if (this.jjtGetNumChildren() != 1) {
throw new ELException(MessageFactory.get(
- "error.funciton.tooManyMethodParameterSets",
+ "error.function.tooManyMethodParameterSets",
getOutputName()));
}
diff --git a/java/org/apache/el/util/Jre9Compat.java
b/java/org/apache/el/util/Jre9Compat.java
index b4d10d7..d9a5462 100644
--- a/java/org/apache/el/util/Jre9Compat.java
+++ b/java/org/apache/el/util/Jre9Compat.java
@@ -48,7 +48,7 @@ class Jre9Compat extends JreCompat {
@Override
- public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+ public boolean canAccess(Object base, AccessibleObject accessibleObject) {
try {
return ((Boolean) canAccessMethod.invoke(accessibleObject,
base)).booleanValue();
} catch (ReflectiveOperationException | IllegalArgumentException e) {
diff --git a/java/org/apache/el/util/JreCompat.java
b/java/org/apache/el/util/JreCompat.java
index 8f226f2..c749939 100644
--- a/java/org/apache/el/util/JreCompat.java
+++ b/java/org/apache/el/util/JreCompat.java
@@ -53,7 +53,7 @@ public class JreCompat {
* @return {code true} if the AccessibleObject can be accessed otherwise
* {code false}
*/
- public boolean canAcccess(Object base, AccessibleObject accessibleObject) {
+ public boolean canAccess(Object base, AccessibleObject accessibleObject) {
// Java 8 doesn't support modules so default to true
return true;
}
diff --git a/java/org/apache/el/util/ReflectionUtil.java
b/java/org/apache/el/util/ReflectionUtil.java
index 05d3286..c2e5931 100644
--- a/java/org/apache/el/util/ReflectionUtil.java
+++ b/java/org/apache/el/util/ReflectionUtil.java
@@ -433,7 +433,7 @@ public class ReflectionUtil {
// If base is non-null, method may be static or non-static
if (m == null ||
(Modifier.isPublic(type.getModifiers()) &&
- (jreCompat.canAcccess(base, m) || base != null &&
jreCompat.canAcccess(null, m)))) {
+ (jreCompat.canAccess(base, m) || base != null &&
jreCompat.canAccess(null, m)))) {
return m;
}
Class<?>[] interfaces = type.getInterfaces();
diff --git a/java/org/apache/jasper/compiler/ELParser.java
b/java/org/apache/jasper/compiler/ELParser.java
index 11276b3..3bcef5b 100644
--- a/java/org/apache/jasper/compiler/ELParser.java
+++ b/java/org/apache/jasper/compiler/ELParser.java
@@ -141,7 +141,7 @@ public class ELParser {
}
/**
- * Parse for a function FunctionInvokation ::= (identifier ':')? identifier
+ * Parse for a function FunctionInvocation ::= (identifier ':')? identifier
* '(' (Expression (,Expression)*)? ')' Note: currently we don't parse
* arguments
*/
diff --git a/java/org/apache/jasper/compiler/Generator.java
b/java/org/apache/jasper/compiler/Generator.java
index 09062aa..b0797a1 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1366,7 +1366,7 @@ class Generator {
if (!Modifier.isPublic(modifiers) ||
Modifier.isInterface(modifiers) ||
Modifier.isAbstract(modifiers) ||
- !jreCompat.canAcccess(null, constructor) ) {
+ !jreCompat.canAccess(null, constructor) ) {
throw new
Exception(Localizer.getMessage("jsp.error.invalid.bean",
Integer.valueOf(modifiers)));
}
diff --git a/java/org/apache/naming/StringManager.java
b/java/org/apache/naming/StringManager.java
index 8e9922d..c8be35c 100644
--- a/java/org/apache/naming/StringManager.java
+++ b/java/org/apache/naming/StringManager.java
@@ -26,7 +26,7 @@ import java.util.ResourceBundle;
/**
* An internationalization / localization helper class which reduces
* the bother of handling ResourceBundles and takes care of the
- * common cases of message formating which otherwise require the
+ * common cases of message formatting which otherwise require the
* creation of Object arrays and such.
*
* <p>The StringManager operates on a package basis. One StringManager
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
