Index: src/main/java/java/util/TreeMap.java =================================================================== --- src/main/java/java/util/TreeMap.java (revision 489675) +++ src/main/java/java/util/TreeMap.java (working copy) @@ -1319,6 +1319,9 @@ */ @Override public V remove(Object key) { + if (size == 0) { + return null; + } Entry node = find(key); if (node == null) { return null; Index: src/test/java/tests/api/java/util/TreeMapTest.java =================================================================== --- src/test/java/tests/api/java/util/TreeMapTest.java (revision 489675) +++ src/test/java/tests/api/java/util/TreeMapTest.java (working copy) @@ -371,6 +371,10 @@ tm = new TreeMap(); assertNull(tm.put(new Integer(1), new Object())); + + // regression for Harmony-2474 + tm = new TreeMap(); + tm.remove(o); } /**