Repository: tomee Updated Branches: refs/heads/release-tomee-1.7.2 6d7188165 -> 57cb87f6f
tomcat 7.0.62 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f95d9592 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f95d9592 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f95d9592 Branch: refs/heads/release-tomee-1.7.2 Commit: f95d9592f6d97104318d34c9eab45e77e07a8f9e Parents: 6d71881 Author: Romain Manni-Bucau <[email protected]> Authored: Sun May 17 22:48:01 2015 +0200 Committer: Jonathan Gallimore <[email protected]> Committed: Sun May 17 22:36:36 2015 +0100 ---------------------------------------------------------------------- pom.xml | 2 +- .../java/org/apache/tomee/loader/TomEEJarScanner.java | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/f95d9592/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 427c69b..e0039bc 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ <jaxb.version>2.2.7</jaxb.version> - <tomcat.version>7.0.61</tomcat.version> + <tomcat.version>7.0.62</tomcat.version> <cxf.version>2.6.16</cxf.version> <!--2.6.4 requires wss4j 1.6.8--> http://git-wip-us.apache.org/repos/asf/tomee/blob/f95d9592/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java index e6e21eb..e70f9d6 100644 --- a/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java +++ b/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java @@ -84,9 +84,17 @@ public class TomEEJarScanner extends StandardJarScanner { tldConfigScanStream = TldConfig.class.getDeclaredMethod("tldScanStream", InputStream.class); tldConfigScanStream.setAccessible(true); - tldConfig = loader.loadClass("org.apache.catalina.startup.TldConfig$TldJarScannerCallback") - .getDeclaredFields()[0]; // there is a unique field and this way it is portable - //.getDeclaredField("this$0"); + + // .getDeclaredField("this$0"); + final Field[] declaredFields = loader.loadClass("org.apache.catalina.startup.TldConfig$TldJarScannerCallback").getDeclaredFields(); + Field tldConfigTmp = null; + for (final Field f : declaredFields) { + if ("org.apache.catalina.startup.TldConfig".equals(f.getType().getName())) { + tldConfigTmp = f; + break; + } + } + tldConfig = tldConfigTmp; // there is a unique field and this way it is portable tldConfig.setAccessible(true); final Class<?> tldLocationsCache = loader.loadClass("org.apache.jasper.compiler.TldLocationsCache");
