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 2014/10/21 19:39:57 UTC
git commit: TOMEE-1418 getting loader config from inplace loader and
not fom reading a file - context.xml, skip our wrapping if already done
Repository: tomee
Updated Branches:
refs/heads/develop c53f36662 -> 0fa7c940a
TOMEE-1418 getting loader config from inplace loader and not fom reading a file - context.xml, skip our wrapping if already done
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0fa7c940
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0fa7c940
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0fa7c940
Branch: refs/heads/develop
Commit: 0fa7c940ad62f66e766687a68ea60d21dde3bffb
Parents: c53f366
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Oct 21 19:39:24 2014 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Oct 21 19:39:49 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/tomee/catalina/LazyStopLoader.java | 4 ++++
.../java/org/apache/tomee/catalina/TomcatWebAppBuilder.java | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/0fa7c940/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopLoader.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopLoader.java
index 6d391eb..677e7c5 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopLoader.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopLoader.java
@@ -158,4 +158,8 @@ public class LazyStopLoader implements Loader, Lifecycle {
public ClassLoader getStopClassLoader() {
return classLoader;
}
+
+ public Loader getDelegateLoader() {
+ return delegate;
+ }
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/0fa7c940/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index 1f9273d..9332a42 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -2075,7 +2075,10 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
}
private static DeploymentLoader.ExternalConfiguration configuredClasspath(final StandardContext standardContext) {
- final Loader loader = standardContext.getLoader();
+ Loader loader = standardContext.getLoader();
+ if (loader != null && LazyStopLoader.class.isInstance(loader)) {
+ loader = LazyStopLoader.class.cast(loader).getDelegateLoader();
+ }
if (loader != null) {
final ClassLoader cl = standardContext.getLoader().getClassLoader();
if (cl == null) {