harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Hindess <mark.hind...@googlemail.com>
Subject Re: svn commit: r966265 - in /harmony/enhanced/java/trunk/classlib/modules/luni/src: main/java/java/util/PriorityQueue.java test/api/common/org/apache/harmony/luni/tests/java/util/PriorityQueueTest.java
Date Fri, 23 Jul 2010 07:54:15 GMT

In message <20100721145605.7E87E2388C7D@eris.apache.org>, tellison@apache.org
writes:
>
> Author: tellison
> Date: Wed Jul 21 14:56:05 2010
> New Revision: 966265
> 
> URL: http://svn.apache.org/viewvc?rev=966265&view=rev
> Log:
> Fix problems with PriorityQueue:
> 1 - the remove test should use equality using equals() not the result of the 
> comparator being 0;
> 2 - attempting to remove an object of the 'wrong' type should just return
> false, not throw a class cast exception.

Tim,

There is a non-trivial conflict in the merge of this commit from trunk
to the java6 branch - due to the fact that this appears to have been
fixed there already but with an equals method call the opposite way
around.

Would you mind doing the merge for this commit.  The command will be
something like:

  svn merge -c 966265 --accept postpone \
            https://svn.apache.org/repos/asf/harmony/enhanced/java/trunk

Regards,
 Mark.



Mime
View raw message