summaryrefslogtreecommitdiffstats
path: root/weaver5
diff options
context:
space:
mode:
authormwebster <mwebster>2006-08-25 14:37:34 +0000
committermwebster <mwebster>2006-08-25 14:37:34 +0000
commit6be70973a704548a42e396e996c9d49915b92a64 (patch)
tree4326d6c6e9f1bfee97785f7106e7c4664b523b27 /weaver5
parent475afa91a3222f6839e7f087760415cc9bb76c98 (diff)
downloadaspectj-6be70973a704548a42e396e996c9d49915b92a64.tar.gz
aspectj-6be70973a704548a42e396e996c9d49915b92a64.zip
Bug 155148 "jdk14 trace deadlock in oc4j" (use formatObj for _all_ arguments)
Diffstat (limited to 'weaver5')
-rw-r--r--weaver5/java5-src/org/aspectj/weaver/tools/Jdk14Trace.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/weaver5/java5-src/org/aspectj/weaver/tools/Jdk14Trace.java b/weaver5/java5-src/org/aspectj/weaver/tools/Jdk14Trace.java
index 28c46d4ea..7072ffcb6 100644
--- a/weaver5/java5-src/org/aspectj/weaver/tools/Jdk14Trace.java
+++ b/weaver5/java5-src/org/aspectj/weaver/tools/Jdk14Trace.java
@@ -29,7 +29,7 @@ public class Jdk14Trace extends AbstractTrace {
if (logger.isLoggable(Level.FINE)) {
logger.entering(name,methodName,formatObj(thiz));
if (args != null && logger.isLoggable(Level.FINER)) {
- logger.entering(name,methodName,args);
+ logger.entering(name,methodName,formatObjects(args));
}
}
}
@@ -40,7 +40,7 @@ public class Jdk14Trace extends AbstractTrace {
public void exit(String methodName, Object ret) {
if (logger.isLoggable(Level.FINE)) {
- logger.exiting(name,methodName,ret);
+ logger.exiting(name,methodName,formatObj(ret));
}
}
@@ -60,7 +60,7 @@ public class Jdk14Trace extends AbstractTrace {
if (logger.isLoggable(Level.FINE)) {
logger.logp(Level.FINER,name,methodName,"EVENT",formatObj(thiz));
if (args != null && logger.isLoggable(Level.FINER)) {
- logger.logp(Level.FINER,name,methodName,"EVENT",args);
+ logger.logp(Level.FINER,name,methodName,"EVENT",formatObjects(args));
}
}
}