[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fix for an IndexOutOfBoundsException in LogManager.

[Kaffe CVS]

PatchSet 5273 
Date: 2004/10/12 01:00:34
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: fix for an IndexOutOfBoundsException in LogManager.findAncestor

2004-10-11  Dalibor Topic <robilad at kaffe.org>

        * libraries/javalib/java/util/logging/LogManager.java:
        Resynced with GNU Classpath.

        2004-10-11  Jeroen Frijters  <jeroen at frijters.net>

        * java/util/logging/LogManager.java
        (findAncestor): Fixed IndexOutOfBoundsException.

Members: 
	ChangeLog:1.2825->1.2826 
	libraries/javalib/java/util/logging/LogManager.java:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2825 kaffe/ChangeLog:1.2826
--- kaffe/ChangeLog:1.2825	Tue Oct 12 00:50:16 2004
+++ kaffe/ChangeLog	Tue Oct 12 01:00:34 2004
@@ -1,5 +1,15 @@
 2004-10-11  Dalibor Topic <robilad at kaffe.org>
 
+	* libraries/javalib/java/util/logging/LogManager.java:
+        Resynced with GNU Classpath.
+
+	2004-10-11  Jeroen Frijters  <jeroen at frijters.net>
+
+        * java/util/logging/LogManager.java
+        (findAncestor): Fixed IndexOutOfBoundsException.
+
+2004-10-11  Dalibor Topic <robilad at kaffe.org>
+
 	* libraries/javalib/java/lang/SecurityManager.java,
 	libraries/javalib/java/security/Security.java:
 	Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/java/util/logging/LogManager.java
diff -u kaffe/libraries/javalib/java/util/logging/LogManager.java:1.7 kaffe/libraries/javalib/java/util/logging/LogManager.java:1.8
--- kaffe/libraries/javalib/java/util/logging/LogManager.java:1.7	Thu Apr 22 09:59:55 2004
+++ kaffe/libraries/javalib/java/util/logging/LogManager.java	Tue Oct 12 01:00:34 2004
@@ -351,6 +351,7 @@
   private synchronized Logger findAncestor(Logger child)
   {
     String childName = child.getName();
+    int    childNameLength = childName.length();
     Logger best = rootLogger;
     int    bestNameLength = 0;
 
@@ -366,9 +367,10 @@
       candName = (String) iter.next();
       candNameLength = candName.length();
 
-      if ((candNameLength > bestNameLength)
+      if (candNameLength > bestNameLength
+	  && childNameLength > candNameLength
 	  && childName.startsWith(candName)
-	  && (childName.charAt(candNameLength) == '.'))
+	  && childName.charAt(candNameLength) == '.')
       {
         cand = (Logger) ((WeakReference) loggers.get(candName)).get();
 	if ((cand == null) || (cand == child))