You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2020/07/12 00:22:32 UTC
[freemarker] 01/02: (Minor typos)
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 2.3-gae
in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 26966a4157f3bc77a5b72d907ff4a71872bae398
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Jun 27 16:19:43 2020 +0200
(Minor typos)
---
.../java/freemarker/ext/beans/ClassIntrospector.java | 16 ++++++++--------
...und.java => Java9InstrospectorBugWorkaroundTest.java} | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/freemarker/ext/beans/ClassIntrospector.java b/src/main/java/freemarker/ext/beans/ClassIntrospector.java
index 36b2511..98580fc 100644
--- a/src/main/java/freemarker/ext/beans/ClassIntrospector.java
+++ b/src/main/java/freemarker/ext/beans/ClassIntrospector.java
@@ -819,21 +819,21 @@ class ClassIntrospector {
// This is needed as java.bean.Introspector sometimes gives back a method that's actually not accessible,
// as it's an override of an accessible method in a non-public subclass. While that's still a public method, calling
// it directly via reflection will throw java.lang.IllegalAccessException, and we are supposed to call the overidden
- // accessible method instead. Like, we migth get two PropertyDescriptor-s for the same property name, and only one
+ // accessible method instead. Like, we might get two PropertyDescriptor-s for the same property name, and only one
// will have a reader method that we can actually call. So we have to find that method here.
- // Furthermore, the return type of the inaccisable method is possibly different (more specific) than the return type
- // of the overidden accessible method. Also Introspector behavior changed with Java 9, as earlier in such case the
- // Introspector returned all variants of the method (so the accessible one was amongst them at least), while in
- // Java 9 it apparently always returns one variant only, but that's sometimes (not sure if it's predictable) the
- // inaccessbile one.
+ // Furthermore, the return type of the inaccessible method is possibly different (more specific) than the return
+ // type of the overridden accessible method. Also Introspector behavior changed with Java 9, as earlier in such
+ // case the Introspector returned all variants of the method (so the accessible one was amongst them at least),
+ // while in Java 9 it apparently always returns one variant only, but that's sometimes (not sure if it's
+ // predictable) the inaccessible one.
private static Method getMatchingAccessibleMethod(Method m, Map<ExecutableMemberSignature, List<Method>> accessibles) {
if (m == null) {
return null;
}
List<Method> ams = accessibles.get(new ExecutableMemberSignature(m));
- // Certainly we could return any of the accessbiles, as Java reflection will call the correct override of the
+ // Certainly we could return any of the accessibles, as Java reflection will call the correct override of the
// method anyway. There's an ambiguity when the return type is "overloaded", but in practice it probably doesn't
- // matter which variant we call. Though, technically, they could do totaly different things. So, to avoid any
+ // matter which variant we call. Though, technically, they could do totally different things. So, to avoid any
// corner cases that cause problems after an upgrade, we make an effort to give same result as before 2.3.31.
return ams != null ? _MethodUtil.getMethodWithClosestNonSubReturnType(m.getReturnType(), ams) : null;
}
diff --git a/src/test/java/freemarker/ext/beans/Java9InstrospectorBugWorkaround.java b/src/test/java/freemarker/ext/beans/Java9InstrospectorBugWorkaroundTest.java
similarity index 94%
rename from src/test/java/freemarker/ext/beans/Java9InstrospectorBugWorkaround.java
rename to src/test/java/freemarker/ext/beans/Java9InstrospectorBugWorkaroundTest.java
index 05fa695..0201b41 100644
--- a/src/test/java/freemarker/ext/beans/Java9InstrospectorBugWorkaround.java
+++ b/src/test/java/freemarker/ext/beans/Java9InstrospectorBugWorkaroundTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import freemarker.template.TemplateException;
import freemarker.test.TemplateTest;
-public class Java9InstrospectorBugWorkaround extends TemplateTest {
+public class Java9InstrospectorBugWorkaroundTest extends TemplateTest {
@Test
public void test() throws IOException, TemplateException {