In message <20100126223233.7fd54816...@nike.apache.org>, Mark Hindess writes: > > In message <201001262220.o0qmkjzq013...@d12av01.megacenter.de.ibm.com>, > Mark Hindess writes: > > > > In message <a43fbc6a1001261346j4889c679m37665761f9a8b...@mail.gmail.com>, > > Jesse Wilson writes: > > > > > > On Tue, Jan 26, 2010 at 5:28 AM, Mark Hindess > > > <mark.hind...@googlemail.com>wrote: > > > > > > > > I've just done a merge of the classlib tr...@901560 to the java6 > > > > branch. There were quite a few conflicts this time around in > > > > particular with TreeMap, TreeSet, and Properties so if you committed > > > > changes to these classes since the last merge you might want to > > > > sanity check that I merged your changes correctly. > > > > > > From my quick read through, you got TreeSet right, but lost change > > > 888668<http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/ > > > modules/luni/src/main/java/java/util/TreeMap.java?r1=824002&r2=888668> > > > in > > > TreeMap. > > > > Jesse, > > > > Fixed in r903454. Thanks for sanity checking this for me. Much > > appreciated. > > Interesting. I've revert this change temporarily as it breaks a number > of tests.
Jesse, Do you have a test case for the problem solved by adding this check? We should probably include it in the test suite and it would be helpful in finding an appropriate fix for the java6 branch. Thanks, -Mark.
