2004-10-18 Jeroen Frijters <jeroen@frijters.net>

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

From-SVN: r89220

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d34ab27db784fdf497071094259ffa851d242938..70a79e06e3b831c64e7dbedd7fd315cf1a3417a0 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-18  Jeroen Frijters  <jeroen@frijters.net>
+
+       * java/util/logging/LogManager.java
+       (findAncestor): Fixed IndexOutOfBoundsException.
+
 2004-10-18  Michael Koch  <konqueror@gmx.de>
 
        * java/io/BufferedInputStream.java: Fixed @author tag.

diff --git a/libjava/java/util/logging/LogManager.java b/libjava/java/util/logging/LogManager.java
index 24757089410f746341abcdea9e2a92b6d35d0140..c77e086b564dab199d2093ae19d730bdbb8fb158 100644 (file)
--- a/libjava/java/util/logging/LogManager.java
+++ b/libjava/java/util/logging/LogManager.java
@@ -351,6 +351,7 @@ public class LogManager
   private synchronized Logger findAncestor(Logger child)
   {
     String childName = child.getName();
+    int    childNameLength = childName.length();
     Logger best = rootLogger;
     int    bestNameLength = 0;
 
@@ -366,9 +367,10 @@ public class LogManager
       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))