Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2010-10-08 12:31:28 +0000
committerGlyn Normington2010-10-08 15:28:38 +0000
commit3ebcf2acc54cf1d3b76c911b42b738a8a427ad6a (patch)
treefdfd4aeaa52cb683c98fa9d6f74dda66919b280d /org.eclipse.virgo.medic/src/main/java/org/eclipse/virgo/medic
parent23bcc4f36d0a7d906ec2b3d761a8c070c988d7cd (diff)
downloadorg.eclipse.virgo.medic-3ebcf2acc54cf1d3b76c911b42b738a8a427ad6a.tar.gz
org.eclipse.virgo.medic-3ebcf2acc54cf1d3b76c911b42b738a8a427ad6a.tar.xz
org.eclipse.virgo.medic-3ebcf2acc54cf1d3b76c911b42b738a8a427ad6a.zip
bug 326423: fix how the calling bundle is determined to avoid nested framework issues and remove the web class loading hook from the scope of the entry/exit trace aspect
Diffstat (limited to 'org.eclipse.virgo.medic/src/main/java/org/eclipse/virgo/medic')
-rw-r--r--org.eclipse.virgo.medic/src/main/java/org/eclipse/virgo/medic/log/EntryExitTrace.aj5
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.virgo.medic/src/main/java/org/eclipse/virgo/medic/log/EntryExitTrace.aj b/org.eclipse.virgo.medic/src/main/java/org/eclipse/virgo/medic/log/EntryExitTrace.aj
index a7ae778..a48462c 100644
--- a/org.eclipse.virgo.medic/src/main/java/org/eclipse/virgo/medic/log/EntryExitTrace.aj
+++ b/org.eclipse.virgo.medic/src/main/java/org/eclipse/virgo/medic/log/EntryExitTrace.aj
@@ -35,6 +35,7 @@ public aspect EntryExitTrace pertypewithin(*) {
// avoid class loading recursion
pointcut kernelUserRegion() : within(org.eclipse.virgo.kernel.userregion..*);
+ pointcut webClassLoading() : within(org.eclipse.virgo.web.core.internal..*);
pointcut logback() : within(ch.qos.logback..*) || within(org.slf4j.impl..*);
@@ -42,9 +43,9 @@ public aspect EntryExitTrace pertypewithin(*) {
pointcut getter() : execution(* get*(..));
- pointcut debugCandidate() : execution(public * *(..)) && !setter() && !getter() && !medic() && !util() && !repository() && !kernelUserRegion() && !logback();
+ pointcut debugCandidate() : execution(public * *(..)) && !setter() && !getter() && !medic() && !util() && !repository() && !kernelUserRegion() && !webClassLoading() && !logback();
- pointcut traceCandidate() : execution(!public * *(..)) && !setter() && !getter() && !medic() && !util() && !repository() && !kernelUserRegion() && !logback();
+ pointcut traceCandidate() : execution(!public * *(..)) && !setter() && !getter() && !medic() && !util() && !repository() && !kernelUserRegion() && !webClassLoading() && !logback();
before() : debugCandidate() {
getLogger(thisJoinPointStaticPart).debug("{} {}", ">",

Back to the top