From: Mark Wielaard <mark@klomp.org>
Date: Tue, 21 Sep 2004 16:27:30 +0000 (+0200)
Subject: TreeMap.java (root): Don't initialize.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d23cb2291b2bfa2d05898694e93fd802b70cf5ff;p=gcc.git

TreeMap.java (root): Don't initialize.

2004-09-21  Mark Wielaard  <mark@klomp.org>

	* java/util/TreeMap.java (root): Don't initialize.
	(TreeMap(Comparator)): Call fabricateTree(0).
	(fabricateTree): Initialize root and size when count is 0.

From-SVN: r87811
---

diff --git a/libjava/java/util/TreeMap.java b/libjava/java/util/TreeMap.java
index d3b67481511..5272bc17301 100644
--- a/libjava/java/util/TreeMap.java
+++ b/libjava/java/util/TreeMap.java
@@ -130,7 +130,7 @@ public class TreeMap extends AbstractMap
   /**
    * The root node of this TreeMap.
    */
-  private transient Node root = nil;
+  private transient Node root;
 
   /**
    * The size of this TreeMap. Package visible for use by nested classes.
@@ -213,6 +213,7 @@ public class TreeMap extends AbstractMap
   public TreeMap(Comparator c)
   {
     comparator = c;
+    fabricateTree(0);
   }
 
   /**
@@ -851,7 +852,11 @@ public class TreeMap extends AbstractMap
   private void fabricateTree(final int count)
   {
     if (count == 0)
-      return;
+      {
+	root = nil;
+	size = 0;
+	return;
+      }
 
     // We color every row of nodes black, except for the overflow nodes.
     // I believe that this is the optimal arrangement. We construct the tree