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 6257fcff1939bee10e2a477eddfbdc1a61eeb177
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 16 14:24:44 2020 +0100
Correct spelling
Based on a PR provided by John Bampton
Internal, non-public API so changes are low risk
---
java/javax/el/ELProcessor.java | 4 ++--
java/javax/el/Jre9Compat.java | 2 +-
java/javax/el/JreCompat.java | 2 +-
java/javax/el/StaticFieldELResolver.java | 4 ++--
java/javax/el/Util.java | 4 ++--
webapps/docs/changelog.xml | 4 ++++
6 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/java/javax/el/ELProcessor.java b/java/javax/el/ELProcessor.java
index 3827168..cef8afc 100644
--- a/java/javax/el/ELProcessor.java
+++ b/java/javax/el/ELProcessor.java
@@ -117,7 +117,7 @@ public class ELProcessor {
if (!Modifier.isStatic(method.getModifiers())) {
continue;
}
- if (!jreCompat.canAcccess(null, method)) {
+ if (!jreCompat.canAccess(null, method)) {
continue;
}
if (method.getName().equals(sig.getName())) {
@@ -192,7 +192,7 @@ public class ELProcessor {
// Check for static, public method and module access for Java 9+
JreCompat jreCompat = JreCompat.getInstance();
- if (!Modifier.isStatic(modifiers) || !jreCompat.canAcccess(null,
method)) {
+ if (!Modifier.isStatic(modifiers) || !jreCompat.canAccess(null,
method)) {
throw new NoSuchMethodException(Util.message(context,
"elProcessor.defineFunctionInvalidMethod",
method.getName(),
method.getDeclaringClass().getName()));
diff --git a/java/javax/el/Jre9Compat.java b/java/javax/el/Jre9Compat.java
index b95f93a..614eeb8 100644
--- a/java/javax/el/Jre9Compat.java
+++ b/java/javax/el/Jre9Compat.java
@@ -61,7 +61,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/javax/el/JreCompat.java b/java/javax/el/JreCompat.java
index 1b21af9..23604d4 100644
--- a/java/javax/el/JreCompat.java
+++ b/java/javax/el/JreCompat.java
@@ -53,7 +53,7 @@ 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/javax/el/StaticFieldELResolver.java
b/java/javax/el/StaticFieldELResolver.java
index d6a9027..e504601 100644
--- a/java/javax/el/StaticFieldELResolver.java
+++ b/java/javax/el/StaticFieldELResolver.java
@@ -46,7 +46,7 @@ public class StaticFieldELResolver extends ELResolver {
JreCompat jreCompat = JreCompat.getInstance();
if (Modifier.isStatic(modifiers) &&
Modifier.isPublic(modifiers) &&
- jreCompat.canAcccess(null, field)) {
+ jreCompat.canAccess(null, field)) {
return field.get(null);
}
} catch (IllegalArgumentException | IllegalAccessException |
@@ -160,7 +160,7 @@ public class StaticFieldELResolver extends ELResolver {
JreCompat jreCompat = JreCompat.getInstance();
if (Modifier.isStatic(modifiers) &&
Modifier.isPublic(modifiers) &&
- jreCompat.canAcccess(null, field)) {
+ jreCompat.canAccess(null, field)) {
return field.getType();
}
} catch (IllegalArgumentException | NoSuchFieldException |
diff --git a/java/javax/el/Util.java b/java/javax/el/Util.java
index 2a01f3a..43b3642 100644
--- a/java/javax/el/Util.java
+++ b/java/javax/el/Util.java
@@ -547,7 +547,7 @@ class Util {
// 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();
@@ -603,7 +603,7 @@ class Util {
Constructor<?> constructor = wrapper.unWrap();
JreCompat jreCompat = JreCompat.getInstance();
- if (!Modifier.isPublic(clazz.getModifiers()) ||
!jreCompat.canAcccess(null, constructor)) {
+ if (!Modifier.isPublic(clazz.getModifiers()) ||
!jreCompat.canAccess(null, constructor)) {
throw new MethodNotFoundException(message(
null, "util.method.notfound", clazz, methodName,
paramString(paramTypes)));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2524fb3..9404a87 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -54,6 +54,10 @@
<update>
Deprecate the JDBCRealm. (markt)
</update>
+ <fix>
+ Correct numerous spellings throughout the code base. Based on a pull
+ request from John Bampton. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
