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
The following commit(s) were added to refs/heads/8.5.x by this push: new eecce7a Additional fix releated to BZ 63781 eecce7a is described below commit eecce7aea9b9dca413bc7eda2bc8e912231cb29c Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Oct 3 21:54:44 2019 +0100 Additional fix releated to BZ 63781 Ensure correct exception time and exception timing for constructors --- java/javax/el/Util.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/java/javax/el/Util.java b/java/javax/el/Util.java index bac56c5..18983ac 100644 --- a/java/javax/el/Util.java +++ b/java/javax/el/Util.java @@ -596,21 +596,16 @@ class Util { Wrapper<Constructor<?>> wrapper = findWrapper(clazz, wrappers, methodName, paramTypes, paramValues); - Constructor<?> constructor = getConstructor(clazz, wrapper.unWrap()); - if (constructor == null) { + Constructor<?> constructor = wrapper.unWrap(); + + JreCompat jreCompat = JreCompat.getInstance(); + if (!Modifier.isPublic(clazz.getModifiers()) || !jreCompat.canAcccess(null, constructor)) { throw new MethodNotFoundException(message( null, "util.method.notfound", clazz, methodName, paramString(paramTypes))); } - return constructor; - } - - static Constructor<?> getConstructor(Class<?> type, Constructor<?> c) { - if (Modifier.isPublic(type.getModifiers())) { - return c; - } - return null; + return constructor; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org