From: Ron B. <rjb...@us...> - 2009-04-08 17:41:21
|
Update of /cvsroot/glassbox/glassbox/monitor/src/glassbox/monitor/resource In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10497/src/glassbox/monitor/resource Modified Files: JndiMonitor.aj Log Message: Update JNDI monitor logic. Index: JndiMonitor.aj =================================================================== RCS file: /cvsroot/glassbox/glassbox/monitor/src/glassbox/monitor/resource/JndiMonitor.aj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** JndiMonitor.aj 6 Sep 2006 07:07:49 -0000 1.1 --- JndiMonitor.aj 8 Apr 2009 17:41:16 -0000 1.2 *************** *** 9,12 **** --- 9,13 ---- import edu.emory.mathcs.util.WeakIdentityHashMap; import glassbox.response.Response; + import glassbox.monitor.AbstractMonitor; import java.io.Serializable; *************** *** 18,33 **** import javax.naming.directory.DirContext; ! public aspect JndiMonitor implements NameResolver { transient private Map nameBindings = Collections.synchronizedMap(new WeakIdentityHashMap()); public pointcut contextLookup(Object name) : within(Context+) && execution(* Context.lookup*(*)) && args(name); - - public pointcut contextList(Object name) : within(Context+) && execution(* Context.list*(*)) && args(name, ..); public pointcut dirSearch(Object name) : within(DirContext+) && execution(NamingEnumeration DirContext.search(..)) && args(name, ..); ! public pointcut monitorPoint(Object name) : contextLookup(name) || contextList(name); after(Object name) returning (Object value) : contextLookup(name) { --- 19,33 ---- import javax.naming.directory.DirContext; ! public aspect JndiMonitor extends AbstractMonitor implements NameResolver { transient private Map nameBindings = Collections.synchronizedMap(new WeakIdentityHashMap()); public pointcut contextLookup(Object name) : within(Context+) && execution(* Context.lookup*(*)) && args(name); public pointcut dirSearch(Object name) : within(DirContext+) && execution(NamingEnumeration DirContext.search(..)) && args(name, ..); ! public pointcut monitorPoint(Object name) : ! within(Context+) && (execution(* Context.lookup*(*)) || execution(* Context.list*(*))) && args(name, ..); after(Object name) returning (Object value) : contextLookup(name) { |