Author: rmannibucau
Date: Sun Oct 23 09:45:30 2016
New Revision: 1766261
URL: http://svn.apache.org/viewvc?rev=1766261&view=rev
Log:
using right classloader to contextconfig
Modified:
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/catalina/startup/MicrowaveContextConfig.java
openwebbeans/microwave/trunk/microwave-core/src/test/resources/sirona.properties
Modified:
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/catalina/startup/MicrowaveContextConfig.java
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/catalina/startup/MicrowaveContextConfig.java?rev=1766261&r1=1766260&r2=1766261&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/catalina/startup/MicrowaveContextConfig.java
(original)
+++
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/catalina/startup/MicrowaveContextConfig.java
Sun Oct 23 09:45:30 2016
@@ -152,7 +152,7 @@ public class MicrowaveContextConfig exte
final Map<String, JavaClassCacheEntry>
javaClassCache, final String key) {
final Collection<Class<?>> classes = webClasses.remove(key);
if (classes != null && !classes.isEmpty()) {
- final ClassLoader loader =
Thread.currentThread().getContextClassLoader();
+ final ClassLoader loader = context.getLoader().getClassLoader();
classes.forEach(c -> {
try (final InputStream stream =
loader.getResourceAsStream(c.getName().replace('.', '/') + ".class")) {
super.processAnnotationsStream(stream, fragment,
handlesTypesOnly, javaClassCache);
Modified:
openwebbeans/microwave/trunk/microwave-core/src/test/resources/sirona.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/test/resources/sirona.properties?rev=1766261&r1=1766260&r2=1766261&view=diff
==============================================================================
---
openwebbeans/microwave/trunk/microwave-core/src/test/resources/sirona.properties
(original)
+++
openwebbeans/microwave/trunk/microwave-core/src/test/resources/sirona.properties
Sun Oct 23 09:45:30 2016
@@ -21,13 +21,11 @@
#
org.apache.sirona.javaagent.listener.CounterListener.excludes = \
+ container:jvm,\
prefix:org.apache.logging.log4j,\
prefix:org.apache.catalina.core.ContainerBase,\
prefix:org.apache.tomcat.util.descriptor.web.WebXml,\
prefix:org.apache.cxf.common.util.Spring,\
- prefix:java,\
- prefix:sun,\
- prefix:jdk,\
prefix:org.apache.sirona
org.apache.sirona.javaagent.path.tracking.activate=false
