OpenJDK7 Backports

[Dalibor Topic]

On 8/10/10 7:10 PM, Dr Andrew John Hughes wrote:
> On 17:02 Tue 10 Aug     , Dalibor Topic wrote:
>> On 8/10/10 4:27 PM, Dr Andrew John Hughes wrote:
>>> On 16:08 Tue 10 Aug     , Dalibor Topic wrote:
>>>> On 8/10/10 12:08 PM, Dr Andrew John Hughes wrote:
>>>>> Here's a webrev for the first of these:
>>>>>
>>>>> http://cr.openjdk.java.net/~andrew/6678385/webrev.01/
>>>>>
>>>>> I agree following this with 6854898 seems appropriate, and I'll have a
>>>>> look for relevant changesets for the other two when we get to them.
>>>>>
>>>>> For now, does this look ok to push?
>>>>
>>>> Thanks for the webrev, Andrew. I've compared the webrev with the original 
>>>> changeset, and while most of it looks fine to me, I'm curious about the 
>>>> origin of differences in the patches for 
>>>> src/solaris/classes/sun/awt/X11/XToolkit.java.
>>>>
>>>
>>> Hmmm, it was just a straight application of the original changeset to
>>> 6, but some bits did have to be manually merged.  I'll have a look as
>>> soon as hg.openjdk.java.net is back -- it seems to be giving me 500
>>> errors at the moment.

> 
> This was the file that caused the most issues in backporting.
> 
> I've compared:
> 
> http://hg.openjdk.java.net/jdk7/jdk7/jdk/diff/f62f7fcc9965/src/solaris/classes/sun/awt/X11/XToolkit.java
> http://cr.openjdk.java.net/~andrew/6678385/webrev.01/src/solaris/classes/sun/awt/X11/XToolkit.java.udiff.html
> 
> and they look the same to me.  Diffing the two files doesn't show up any differences in this code either
> as far as I can see.  The diff merely seems to have been rejigged in the backport, but the content seems
> to be the same.  Was there a particular issue you spotted?

No, I was just curious what caused the higher then expected amount of diff noise for that file. Thank you
for the explanation. I've compared the files as well, and the diff looks fine to me. 

Approved to be backported to OpenJDK 6.

cheers,
dalibor topic
-- 
<http://www.oracle.com/>
Dalibor Topic
Phone: +49 40 23646738
Oracle

ORACLE Deutschland B.V. & Co. KG | Nagelsweg 55 | 20097 Hamburg

ORACLE Deutschland B.V. & Co. KG
Hauptverwaltung: Riesstr. 25, D-80992 München
Registergericht: Amtsgericht München, HRA 95603

Komplementärin: ORACLE Deutschland Verwaltung B.V.
Rijnzathe 6, 3454PV De Meern, Niederlande
Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697
Geschäftsführer: Jürgen Kunz, Marcel van de Molen, Alexander van der Ven

<http://www.oracle.com/commitment>

	

Oracle is committed to developing practices and products that help protect the environment