Author: rareddy
Date: 2009-08-24 18:41:19 -0400 (Mon, 24 Aug 2009)
New Revision: 1276
Modified:
trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java
Log:
TEIID-672, TEIID-697: There were conflicting ways to define the Logging Levels in the
Admin API, one defined by EmbeddedLogger and second by the LogConfiguration. Log4J can
return a logging level as NULL, in that case take the parent logger's log level.
Modified:
trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java
===================================================================
---
trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java 2009-08-24
21:11:47 UTC (rev 1275)
+++
trunk/common-internal/src/main/java/com/metamatrix/common/log/LogConfigurationImpl.java 2009-08-24
22:41:19 UTC (rev 1276)
@@ -49,9 +49,12 @@
}
@Override
- public int getLogLevel(String context) {
- context = fixContext(context);
+ public int getLogLevel(String context) {
Integer level = this.contextMap.get(context);
+ if (level == null) {
+ context = fixContext(context);
+ }
+ level = this.contextMap.get(context);
if (level != null) {
return level;
}
Show replies by date