From 279fa86a3c89ea5f137f3d2856622ef42df11a97 Mon Sep 17 00:00:00 2001 From: Steve Hannah Date: Thu, 14 May 2015 09:53:32 -0700 Subject: [PATCH] Fixed nullpointer when creating iterator on TreeMap where root node is null. --- .../src/main/java/org/teavm/classlib/java/util/TTreeMap.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java index 585944995..3b265c1c4 100644 --- a/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java +++ b/teavm-classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java @@ -691,7 +691,7 @@ public class TTreeMap extends TAbstractMap implements TCloneable, TS public EntryIterator(TTreeMap owner, TreeNode[] path, TreeNode to, boolean reverse) { this.owner = owner; modCount = owner.modCount; - this.path = TArrays.copyOf(path, owner.root.height); + this.path = TArrays.copyOf(path, owner.root == null ? 0 : owner.root.height); depth = path.length; this.to = to; this.reverse = reverse;