# HG changeset patch # User Gilles Duboscq # Date 1377533166 -7200 # Node ID 496cf245f023445c0f72b9c84185791adb8be165 # Parent 774e1c2f8741c1686139ec5ac2d336ed6eff8a1f Fix logging for leaf scope diff -r 774e1c2f8741 -r 496cf245f023 graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java --- a/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java Mon Aug 26 18:04:53 2013 +0200 +++ b/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/internal/DebugScope.java Mon Aug 26 18:06:06 2013 +0200 @@ -239,7 +239,6 @@ } instanceTL.set(newChild); newChild.updateFlags(); - newChild.setLogEnabled(oldContext.isLogEnabled()); try (TimerCloseable a = scopeTime.start()) { return executeScope(runnable, callable); } finally { @@ -282,6 +281,7 @@ meterEnabled = false; timeEnabled = false; dumpEnabled = false; + setLogEnabled(false); // Be pragmatic: provide a default log stream to prevent a crash if the stream is not // set while logging @@ -291,6 +291,7 @@ timeEnabled = config.isTimeEnabled(); dumpEnabled = config.isDumpEnabled(); output = config.output(); + setLogEnabled(config.isLogEnabled()); } } @@ -390,7 +391,6 @@ public void setConfig(DebugConfig newConfig) { configTL.set(newConfig); updateFlags(); - setLogEnabled(newConfig != null && newConfig.isLogEnabled()); } public String getQualifiedName() {