avoid infinite recursion during class loading during logging

1 files changed, 88 insertions, 75 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 7b0b1d8..1687a5a 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
@@ -24,80 +24,93 @@ import org.slf4j.LoggerFactory;
  * 
  */
 public aspect EntryExitTrace pertypewithin(*) {
-	
+
 	private volatile Logger logger;
-	
-    pointcut medic() : within(org.eclipse.virgo.medic..*);
-
-    pointcut util() : within(org.eclipse.virgo.util..*);
-    
-    pointcut repository() : within(org.eclipse.virgo.repository..*);
-    
-    pointcut logback() : within(ch.qos.logback..*) || within(org.slf4j.impl..*);
-    
-    pointcut setter() : execution(* set*(..));
-    
-    pointcut getter() : execution(* get*(..));
-    
-    pointcut infoCandidate() : execution(public * *(..)) && !setter() && !getter() && !medic() && !util() && !repository() && !logback();
-    
-    pointcut debugCandidate() : execution(!public !private * *(..)) && !setter() && !getter() && !medic() && !util() && !repository() && !logback();
-    
-    pointcut traceCandidate() : execution(private * *(..)) && !setter() && !getter() && !medic() && !util() && !repository() && !logback();
-    
-    before() : infoCandidate() {
-        getLogger(thisJoinPointStaticPart).info("{} {}", ">", getSignature(thisJoinPointStaticPart));
-    }
-
-    after() returning : infoCandidate()  {
-        getLogger(thisJoinPointStaticPart).info("{} {}", "<", getSignature(thisJoinPointStaticPart));
-    }
-
-    after() throwing(Throwable t) : infoCandidate()  {
-        Logger logger = getLogger(thisJoinPointStaticPart);
-        if (logger.isInfoEnabled()) {
-            logger.info(String.format("< %s", getSignature(thisJoinPointStaticPart)), t);
-        }
-    }
-
-    before() : debugCandidate() {
-        getLogger(thisJoinPointStaticPart).debug("{} {}", ">", getSignature(thisJoinPointStaticPart));
-    }
-
-    after() returning : debugCandidate()  {
-        getLogger(thisJoinPointStaticPart).debug("{} {}", "<", getSignature(thisJoinPointStaticPart));
-    }
-
-    after() throwing(Throwable t) : debugCandidate()  {
-        Logger logger = getLogger(thisJoinPointStaticPart);
-        if (logger.isDebugEnabled()) {
-            logger.debug(String.format("< %s", getSignature(thisJoinPointStaticPart)), t);
-        }
-    }
-    
-    before() : traceCandidate() {
-        getLogger(thisJoinPointStaticPart).trace("{} {}", ">", getSignature(thisJoinPointStaticPart));
-    }
-
-    after() returning : traceCandidate()  {
-        getLogger(thisJoinPointStaticPart).trace("{} {}", "<", getSignature(thisJoinPointStaticPart));
-    }
-
-    after() throwing(Throwable t) : traceCandidate()  {
-        Logger logger = getLogger(thisJoinPointStaticPart);
-        if (logger.isTraceEnabled()) {
-            logger.trace(String.format("< %s", getSignature(thisJoinPointStaticPart)), t);
-        }
-    }
-
-    private Logger getLogger(JoinPoint.StaticPart sp) {
-    	if (this.logger == null) {
-    		this.logger = LoggerFactory.getLogger(sp.getSignature().getDeclaringType());
-    	}
-    	return this.logger;
-    }
-
-    private String getSignature(JoinPoint.StaticPart sp) {
-        return sp.getSignature().toLongString();
-    }
+
+	pointcut medic() : within(org.eclipse.virgo.medic..*);
+
+	pointcut util() : within(org.eclipse.virgo.util..*);
+
+	pointcut repository() : within(org.eclipse.virgo.repository..*);
+
+	// avoid class loading recursion
+	pointcut kernelUserRegion() : within(org.eclipse.virgo.kernel.userregion..*);
+
+	pointcut logback() : within(ch.qos.logback..*) || within(org.slf4j.impl..*);
+
+	pointcut setter() : execution(* set*(..));
+
+	pointcut getter() : execution(* get*(..));
+
+	pointcut infoCandidate() : execution(public * *(..)) && !setter() && !getter() && !medic() && !util() && !repository() && !kernelUserRegion() && !logback();
+
+	pointcut debugCandidate() : execution(!public !private * *(..)) && !setter() && !getter() && !medic() && !util() && !repository() && !kernelUserRegion() && !logback();
+
+	pointcut traceCandidate() : execution(private * *(..)) && !setter() && !getter() && !medic() && !util() && !repository() && !kernelUserRegion() && !logback();
+
+	before() : infoCandidate() {
+		getLogger(thisJoinPointStaticPart).info("{} {}", ">",
+				getSignature(thisJoinPointStaticPart));
+	}
+
+	after() returning : infoCandidate()  {
+		getLogger(thisJoinPointStaticPart).info("{} {}", "<",
+				getSignature(thisJoinPointStaticPart));
+	}
+
+	after() throwing(Throwable t) : infoCandidate()  {
+		Logger logger = getLogger(thisJoinPointStaticPart);
+		if (logger.isInfoEnabled()) {
+			logger.info(String.format("< %s",
+					getSignature(thisJoinPointStaticPart)), t);
+		}
+	}
+
+	before() : debugCandidate() {
+		getLogger(thisJoinPointStaticPart).debug("{} {}", ">",
+				getSignature(thisJoinPointStaticPart));
+	}
+
+	after() returning : debugCandidate()  {
+		getLogger(thisJoinPointStaticPart).debug("{} {}", "<",
+				getSignature(thisJoinPointStaticPart));
+	}
+
+	after() throwing(Throwable t) : debugCandidate()  {
+		Logger logger = getLogger(thisJoinPointStaticPart);
+		if (logger.isDebugEnabled()) {
+			logger.debug(String.format("< %s",
+					getSignature(thisJoinPointStaticPart)), t);
+		}
+	}
+
+	before() : traceCandidate() {
+		getLogger(thisJoinPointStaticPart).trace("{} {}", ">",
+				getSignature(thisJoinPointStaticPart));
+	}
+
+	after() returning : traceCandidate()  {
+		getLogger(thisJoinPointStaticPart).trace("{} {}", "<",
+				getSignature(thisJoinPointStaticPart));
+	}
+
+	after() throwing(Throwable t) : traceCandidate()  {
+		Logger logger = getLogger(thisJoinPointStaticPart);
+		if (logger.isTraceEnabled()) {
+			logger.trace(String.format("< %s",
+					getSignature(thisJoinPointStaticPart)), t);
+		}
+	}
+
+	private Logger getLogger(JoinPoint.StaticPart sp) {
+		if (this.logger == null) {
+			this.logger = LoggerFactory.getLogger(sp.getSignature()
+					.getDeclaringType());
+		}
+		return this.logger;
+	}
+
+	private String getSignature(JoinPoint.StaticPart sp) {
+		return sp.getSignature().toLongString();
+	}
 }