ceki 2004/12/12 13:30:30
Modified: src/java/org/apache/log4j PropertyConfigurator.java
Log:
Explicitly marking the origin of the constant named "INHERITED".
Revision Changes Path
1.74 +3 -2
logging-log4j/src/java/org/apache/log4j/PropertyConfigurator.java
Index: PropertyConfigurator.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/PropertyConfigurator.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- PropertyConfigurator.java 12 Dec 2004 20:49:57 -0000 1.73
+++ PropertyConfigurator.java 12 Dec 2004 21:30:30 -0000 1.74
@@ -24,6 +24,7 @@
import org.apache.log4j.config.PropertySetter;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.or.RendererMap;
+import org.apache.log4j.spi.Configurator;
import org.apache.log4j.spi.ErrorItem;
import org.apache.log4j.spi.LoggerFactory;
import org.apache.log4j.spi.LoggerRepository;
@@ -599,8 +600,8 @@
// null. We also check that the user has not specified inherited for
the
// root category.
if (
- INHERITED.equalsIgnoreCase(levelStr)
- || NULL.equalsIgnoreCase(levelStr)) {
+ Configurator.INHERITED.equalsIgnoreCase(levelStr)
+ || Configurator.NULL.equalsIgnoreCase(levelStr)) {
if (loggerName.equals(INTERNAL_ROOT_NAME)) {
getLogger(repository).warn("The root logger cannot be set to
null.");
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
