This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c7052ae3fad9b89b3ac586a60c74c667985ad19c
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/Jre9Compat.java | 2 +-
java/javax/el/JreCompat.java | 2 +-
java/javax/el/Util.java | 4 ++--
webapps/docs/changelog.xml | 8 ++++++++
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/java/javax/el/Jre9Compat.java b/java/javax/el/Jre9Compat.java
index 9342b05..5f4b56d 100644
--- a/java/javax/el/Jre9Compat.java
+++ b/java/javax/el/Jre9Compat.java
@@ -49,7 +49,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 (IllegalArgumentException e) {
diff --git a/java/javax/el/JreCompat.java b/java/javax/el/JreCompat.java
index 6d68ed0..b0c519a 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/Util.java b/java/javax/el/Util.java
index 57d779d..ad5c1ec 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 3bd9dfe..fe1c04e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -60,6 +60,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.107 (violetagg)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Correct numerous spellings throughout the code base. Based on a pull
+ request from John Bampton. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.106 (violetagg)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
