[classlib] Merge of trunk to java6 branch

2010-01-26 Thread Mark Hindess
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

Re: [classlib] Merge of trunk to java6 branch

2010-01-26 Thread Jesse Wilson
On Tue, Jan 26, 2010 at 5:28 AM, Mark Hindess mark.hind...@googlemail.comwrote: 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

Re: [classlib] Merge of trunk to java6 branch

2010-01-26 Thread Mark Hindess
In message a43fbc6a1001261346j4889c679m37665761f9a8b...@mail.gmail.com, Jesse Wilson writes: On Tue, Jan 26, 2010 at 5:28 AM, Mark Hindess mark.hind...@googlemail.comwrote: I've just done a merge of the classlib tr...@901560 to the java6 branch. There were quite a few conflicts this

Re: [classlib] Merge of trunk to java6 branch

2010-01-26 Thread Mark Hindess
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.comwrote: I've just done a

Re: [classlib] Merge of trunk to java6 branch

2010-01-26 Thread Mark Hindess
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

Re: [classlib] Merge of trunk to java6 branch

2010-01-26 Thread Jesse Wilson
On Tue, Jan 26, 2010 at 2:37 PM, Mark Hindess mark.hind...@googlemail.comwrote: 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.