ceki 01/03/22 10:37:53
Modified: src/java/org/apache/log4j/helpers OptionConverter.java
src/java/org/apache/log4j/spi LoggingEvent.java
Log:
OptionConverter.instantiateByKey method now performs variable substitution before
instantiation.
Revision Changes Path
1.13 +2 -2
jakarta-log4j/src/java/org/apache/log4j/helpers/OptionConverter.java
Index: OptionConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j/src/java/org/apache/log4j/helpers/OptionConverter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- OptionConverter.java 2001/02/21 22:28:16 1.12
+++ OptionConverter.java 2001/03/22 18:37:49 1.13
@@ -105,7 +105,7 @@
Object defaultValue) {
// Get the value of the property in string form
- String className = props.getProperty(key);
+ String className = findAndSubst(key, props);
if(className == null) {
LogLog.error("Could not find value for key " + key);
return defaultValue;
@@ -225,7 +225,7 @@
Class classObj = Class.forName(className);
if(!superClass.isAssignableFrom(classObj)) {
LogLog.error("A \""+className+"\" object is not assignable to a \""+
- superClass.getName() + "\" object.");
+ superClass.getName() + "\" variable.");
return defaultValue;
}
return classObj.newInstance();
1.9 +0 -2 jakarta-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java
Index: LoggingEvent.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/spi/LoggingEvent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LoggingEvent.java 2001/01/26 13:27:46 1.8
+++ LoggingEvent.java 2001/03/22 18:37:51 1.9
@@ -227,8 +227,6 @@
// serialize this event's priority
writePriority(oos);
-
-
}
private
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
