You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by yo...@apache.org on 2004/09/01 19:10:53 UTC
cvs commit: logging-log4j/log4jMini/src/java/org/apache/log4j NDC.java PropertyConfigurator.java
yoavs 2004/09/01 10:10:52
Modified: log4jMini/src/java/org/apache/log4j NDC.java
PropertyConfigurator.java
Log:
Two more enum keywords replaced for JDK 1.5.
Revision Changes Path
1.2 +3 -3 logging-log4j/log4jMini/src/java/org/apache/log4j/NDC.java
Index: NDC.java
===================================================================
RCS file: /home/cvs/logging-log4j/log4jMini/src/java/org/apache/log4j/NDC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NDC.java 9 Jan 2003 10:57:08 -0000 1.1
+++ NDC.java 1 Sep 2004 17:10:52 -0000 1.2
@@ -240,13 +240,13 @@
int misses = 0;
v = new Vector();
- Enumeration enum = ht.keys();
+ Enumeration enumeration = ht.keys();
// We give up after 4 straigt missses. That is 4 consecutive
// inspected threads in 'ht' that turn out to be alive.
// The higher the proportion on dead threads in ht, the higher the
// chances of removal.
- while(enum.hasMoreElements() && (misses <= 4)) {
- Thread t = (Thread) enum.nextElement();
+ while(enumeration.hasMoreElements() && (misses <= 4)) {
+ Thread t = (Thread) enumeration.nextElement();
if(t.isAlive()) {
misses++;
} else {
1.2 +3 -3 logging-log4j/log4jMini/src/java/org/apache/log4j/PropertyConfigurator.java
Index: PropertyConfigurator.java
===================================================================
RCS file: /home/cvs/logging-log4j/log4jMini/src/java/org/apache/log4j/PropertyConfigurator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyConfigurator.java 9 Jan 2003 10:57:08 -0000 1.1
+++ PropertyConfigurator.java 1 Sep 2004 17:10:52 -0000 1.2
@@ -341,9 +341,9 @@
*/
protected
void parseCats(Properties props, Hierarchy hierarchy) {
- Enumeration enum = props.propertyNames();
- while(enum.hasMoreElements()) {
- String key = (String) enum.nextElement();
+ Enumeration enumeration = props.propertyNames();
+ while(enumeration.hasMoreElements()) {
+ String key = (String) enumeration.nextElement();
if(key.startsWith(CATEGORY_PREFIX)) {
String categoryName = key.substring(CATEGORY_PREFIX.length());
String value = props.getProperty(key);
---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org