You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/05/17 22:48:17 UTC
tomee git commit: tomcat 7.0.62
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x ded183522 -> 0da70c87d
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/0da70c87
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0da70c87
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0da70c87
Branch: refs/heads/tomee-1.7.x
Commit: 0da70c87d7f30bc1e9d165769f1848707ff7763a
Parents: ded1835
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Sun May 17 22:48:01 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Sun May 17 22:48:01 2015 +0200
----------------------------------------------------------------------
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/0da70c87/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cbe00c1..ab5adb0 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/0da70c87/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");