From omajid at redhat.com Fri Oct 1 14:31:37 2010 From: omajid at redhat.com (Omair Majid) Date: Fri, 01 Oct 2010 17:31:37 -0400 Subject: Request to backport: 6623943: javax.swing.TimerQueue's thread occasionally fails to start Message-ID: <4CA65339.8090103@redhat.com> Hi, I would like to backport the following changeset to openjdk6: changeset: 597:fc09152d5cf6 user: idk date: Mon Jun 23 15:21:37 2008 -0400 summary: 6623943: javax.swing.TimerQueue's thread occasionally fails to start This fixes some race conditions in javax.swing.TimerQueue. Thanks, Omair From joe.darcy at oracle.com Fri Oct 1 20:35:17 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 01 Oct 2010 20:35:17 -0700 Subject: Request to backport: 6623943: javax.swing.TimerQueue's thread occasionally fails to start In-Reply-To: <4CA65339.8090103@redhat.com> References: <4CA65339.8090103@redhat.com> Message-ID: <4CA6A875.9090008@oracle.com> Omair Majid wrote: > Hi, > > I would like to backport the following changeset to openjdk6: > > changeset: 597:fc09152d5cf6 > user: idk > date: Mon Jun 23 15:21:37 2008 -0400 > summary: 6623943: javax.swing.TimerQueue's thread occasionally > fails to start > > This fixes some race conditions in javax.swing.TimerQueue. > > Thanks, > Omair Approved to be backported. Thanks, -Joe From omajid at redhat.com Mon Oct 4 12:31:55 2010 From: omajid at redhat.com (omajid at redhat.com) Date: Mon, 04 Oct 2010 19:31:55 +0000 Subject: hg: jdk6/jdk6/jdk: 6623943: javax.swing.TimerQueue's thread occasionally fails to start Message-ID: <20101004193203.890E247EDD@hg.openjdk.java.net> Changeset: 2e8ca9a18288 Author: idk Date: 2008-06-23 15:21 -0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/2e8ca9a18288 6623943: javax.swing.TimerQueue's thread occasionally fails to start Reviewed-by: alexp ! src/share/classes/javax/swing/JApplet.java ! src/share/classes/javax/swing/TimerQueue.java From omajid at redhat.com Mon Oct 4 13:18:20 2010 From: omajid at redhat.com (Omair Majid) Date: Mon, 04 Oct 2010 16:18:20 -0400 Subject: Request to backport: 6623943: javax.swing.TimerQueue's thread occasionally fails to start In-Reply-To: <4CA6A875.9090008@oracle.com> References: <4CA65339.8090103@redhat.com> <4CA6A875.9090008@oracle.com> Message-ID: <4CAA368C.3060605@redhat.com> On 10/01/2010 11:35 PM, Joe Darcy wrote: > Omair Majid wrote: >> Hi, >> >> I would like to backport the following changeset to openjdk6: >> >> changeset: 597:fc09152d5cf6 >> user: idk >> date: Mon Jun 23 15:21:37 2008 -0400 >> summary: 6623943: javax.swing.TimerQueue's thread occasionally fails >> to start >> >> This fixes some race conditions in javax.swing.TimerQueue. >> >> Thanks, >> Omair > > Approved to be backported. > Thanks Joe. I have pushed the changeset to openjdk6. Cheers, Omair From ahughes at redhat.com Fri Oct 8 07:08:14 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 8 Oct 2010 15:08:14 +0100 Subject: hs19 import In-Reply-To: <4C9C55A5.3070205@oracle.com> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> <20100923194817.GK23441@rivendell.middle-earth.co.uk> <4C9BD2A7.7000705@oracle.com> <4C9C55A5.3070205@oracle.com> Message-ID: <20101008140814.GA1907@rivendell.middle-earth.co.uk> On 00:39 Fri 24 Sep , Erik Trimble wrote: > On 9/23/2010 3:20 PM, Erik Trimble wrote: > > [On 9/23/2010 12:48 PM, Dr Andrew John Hughes wrote: > >> On 09:46 Thu 23 Sep , Joe Darcy wrote: > >>> Dr Andrew John Hughes wrote: > >>>> On 08:51 Tue 21 Sep , Joe Darcy wrote: > >>>> > >>>>> Erik Trimble wrote: > >>>>> > >>>>>> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: > >>>>>> > >>>>>>> On 21:37 Wed 15 Sep , Erik Trimble wrote: > >>>>>>> > >>>>>>>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: > >>>>>>>> > >>>>>>>>> I notice that new repositories have appeared for a hs19 stable > >>>>>>>>> branch: > >>>>>>>>> > >>>>>>>>> http://hg.openjdk.java.net/hsx/hsx19/master/ > >>>>>>>>> > >>>>>>>>> Shall we start looking at this with regards to importing it > >>>>>>>>> for b21? > >>>>>>>>> > >>>>>>>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now > >>>>>>>> starting with Hotspot 20). > >>>>>>>> > >>>>>>>> I would consider the hsx19 repos to be stable. There *may* be > >>>>>>>> additional > >>>>>>>> development in them, but if so (and I'm not specifically promising > >>>>>>>> anything), such development will be stabilization only. New > >>>>>>>> feature > >>>>>>>> development is now in HS20 over in the main JDK7 repos. > >>>>>>>> > >>>>>>>> HS19 is now in stabilization (bugfix-only) stage, and is > >>>>>>>> suitable for > >>>>>>>> work to begin on importing into OpenJDK 6. > >>>>>>>> > >>>>>>>> > >>>>>>> Thanks for the quick reply, Erik. > >>>>>>> > >>>>>>> I've started work on the merge, which is taking a while because of > >>>>>>> the orthogonal > >>>>>>> copyright header changes in OpenJDK6 and HotSpot :-( > >>>>>>> > >>>>>>> One thing I have noticed is that some headers in hs19 don't have a > >>>>>>> trailing comma before 'Oracle' > >>>>>>> and this is also true of the header template: > >>>>>>> > >>>>>>> --- make/templates/gpl-cp-header 2010-09-20 > >>>>>>> 19:34:32.605298269 +0100 > >>>>>>> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 > >>>>>>> 13:01:36.601792981 +0100 > >>>>>>> @@ -1,4 +1,4 @@ > >>>>>>> -Copyright %YEARS%, Oracle and/or its affiliates. All rights > >>>>>>> reserved. > >>>>>>> +Copyright %YEARS% Oracle and/or its affiliates. All rights > >>>>>>> reserved. > >>>>>>> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > >>>>>>> > >>>>>>> Is HotSpot 19 correct or OpenJDK6? > >>>>>>> > >>>>>> I think it's both. :-) > >>>>>> > >>>>>> > >>>>>> That is, the correct format for an explicitly stated copyright > >>>>>> should be > >>>>>> > >>>>>> > >>>>>> Copyright 2000, Oracle and/or .... > >>>>>> > >>>>>> AND > >>>>>> > >>>>>> Copyright 2000, 2003, Oracle and/or ... > >>>>>> > >>>>>> > >>>>>> There should be a comma after each date (the second instance > >>>>>> implies a > >>>>>> date range between the two years). > >>>>>> > >>>>>> For the %YEARS% substitution in the templates, I don't think it > >>>>>> matters whether there is a comma. It won't be right after a > >>>>>> substitution no matter what we do. :-) > >>>>>> > >>>>>> > >>>>>> If you find instances of the the first case where there isn't a > >>>>>> proper > >>>>>> comma inserted, PLEASE let me know. I need to fix it. > >>>>>> > >>>>>> > >>>>> Erik, > >>>>> > >>>>> Back during the big rebranding push, the GPL templates got updated > >>>>> a few > >>>>> times: > >>>>> > >>>>> 6943119: Rebrand source copyright notices > >>>>> 6961870: More rebranding fixes for templates/gpl-*-header files > >>>>> > >>>>> At the time, I didn't update the templates in the HotSpot repo in an > >>>>> attempt to avoid future merge issues. However, the templates in HS > >>>>> should match the templates in the jdk and root repository which > >>>>> now read as > >>>>> > >>>>> Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights > >>>>> reserved. > >>>>> > >>>>> -Joe > >>>>> > >>>>> > >>>> This webrev (against the current hotspot-rt tree) fixes the > >>>> copyright issues, > >>>> including the template files Joe mentions and the missing trailing > >>>> commas as well as > >>>> providing some copyright year updates present in OpenJDK6 but not > >>>> HotSpot. > >>>> > >>>> http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ > >>>> > >>>> Erik, feel free to assign this a bug ID and push it through JPRT if > >>>> it helps. > >>>> > >>>> Joe, a webrev for the OpenJDK6 hs19 merge is at: > >>>> > >>>> http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ > >>>> > >>>> Please let me know if I can push this. > >>>> > >>>> Thanks, > >>>> > >>> Hi Andrew. > >>> > >>> I won't get a chance to look at this until after JavaOne. > >>> > >> Yeah, it's okay, I kinda guessed :-D > >> There's no rush, we're already testing it in IcedTea. > >> > >> Enjoy the conference! > >> > >>> Thanks, > >>> > >>> -Joe > > > > > > I'll do this tomorrow. It should get fixed a couple of different > > places, so I'll have to create a CR for it. > > > > > OK, I just looked at this. > > I've cloned the whole JDK7 forest, and did this: > > [et151817 at foundation jdk-forest]$ ggrep -r '%YEARS' . > ./make/templates/gpl-header:Copyright %YEARS% Sun Microsystems, Inc. > All Rights Reserved. > ./make/templates/gpl-cp-header:Copyright %YEARS% Sun Microsystems, Inc. > All Rights Reserved. > ./make/templates/bsd-header:Copyright %YEARS% Sun Microsystems, Inc. > All Rights Reserved. > ./jdk/make/templates/gpl-header:Copyright %YEARS% Sun Microsystems, > Inc. All Rights Reserved. > ./jdk/make/templates/gpl-cp-header:Copyright %YEARS% Sun Microsystems, > Inc. All Rights Reserved. > ./jdk/make/templates/bsd-header:Copyright %YEARS% Sun Microsystems, > Inc. All Rights Reserved. > ./hotspot/make/templates/bsd-header:Copyright %YEARS% Oracle and/or its > affiliates. All rights reserved. > ./hotspot/make/templates/gpl-cp-header:Copyright %YEARS% Oracle and/or > its affiliates. All rights reserved. > ./hotspot/make/templates/gpl-header:Copyright %YEARS% Oracle and/or its > affiliates. All rights reserved. > > > This applies in the full jdk6/jdk6 forest, the full jdk7/jdk7 forest, > and the abbreviated hsx/hsx19 forests. > > > > I will be changing the hotspot/make/templates files to be this: > > > Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. > > > I'll then push it to the jdk7 and hsx19 repos. > > > > Joe or Kelly - can you fix the line in the jdk/make/templates and > make/templates directories? > > > > -- > > Erik Trimble > Java System Support > Mailstop: usca22-123 > Phone: x17195 > Santa Clara, CA > Hi Erik, I saw the template change went in. The webrev I posted also contained corrections to a number of the headers on the files, both ones with a missing comma and ones which hadn't been updated. These really need to be fixed as well. Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Fri Oct 8 07:08:37 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 8 Oct 2010 15:08:37 +0100 Subject: hs19 import In-Reply-To: <4C9B8466.8040304@oracle.com> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> Message-ID: <20101008140837.GB1907@rivendell.middle-earth.co.uk> On 09:46 Thu 23 Sep , Joe Darcy wrote: > Dr Andrew John Hughes wrote: > > On 08:51 Tue 21 Sep , Joe Darcy wrote: > > > >> Erik Trimble wrote: > >> > >>> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: > >>> > >>>> On 21:37 Wed 15 Sep , Erik Trimble wrote: > >>>> > >>>>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: > >>>>> > >>>>>> I notice that new repositories have appeared for a hs19 stable branch: > >>>>>> > >>>>>> http://hg.openjdk.java.net/hsx/hsx19/master/ > >>>>>> > >>>>>> Shall we start looking at this with regards to importing it for b21? > >>>>>> > >>>>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now > >>>>> starting with Hotspot 20). > >>>>> > >>>>> I would consider the hsx19 repos to be stable. There *may* be > >>>>> additional > >>>>> development in them, but if so (and I'm not specifically promising > >>>>> anything), such development will be stabilization only. New feature > >>>>> development is now in HS20 over in the main JDK7 repos. > >>>>> > >>>>> HS19 is now in stabilization (bugfix-only) stage, and is suitable for > >>>>> work to begin on importing into OpenJDK 6. > >>>>> > >>>>> > >>>> Thanks for the quick reply, Erik. > >>>> > >>>> I've started work on the merge, which is taking a while because of > >>>> the orthogonal > >>>> copyright header changes in OpenJDK6 and HotSpot :-( > >>>> > >>>> One thing I have noticed is that some headers in hs19 don't have a > >>>> trailing comma before 'Oracle' > >>>> and this is also true of the header template: > >>>> > >>>> --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 > >>>> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 > >>>> 13:01:36.601792981 +0100 > >>>> @@ -1,4 +1,4 @@ > >>>> -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. > >>>> +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. > >>>> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > >>>> > >>>> Is HotSpot 19 correct or OpenJDK6? > >>>> > >>> I think it's both. :-) > >>> > >>> > >>> That is, the correct format for an explicitly stated copyright should be > >>> > >>> > >>> Copyright 2000, Oracle and/or .... > >>> > >>> AND > >>> > >>> Copyright 2000, 2003, Oracle and/or ... > >>> > >>> > >>> There should be a comma after each date (the second instance implies a > >>> date range between the two years). > >>> > >>> For the %YEARS% substitution in the templates, I don't think it > >>> matters whether there is a comma. It won't be right after a > >>> substitution no matter what we do. :-) > >>> > >>> > >>> If you find instances of the the first case where there isn't a proper > >>> comma inserted, PLEASE let me know. I need to fix it. > >>> > >>> > >> Erik, > >> > >> Back during the big rebranding push, the GPL templates got updated a few > >> times: > >> > >> 6943119: Rebrand source copyright notices > >> 6961870: More rebranding fixes for templates/gpl-*-header files > >> > >> At the time, I didn't update the templates in the HotSpot repo in an > >> attempt to avoid future merge issues. However, the templates in HS > >> should match the templates in the jdk and root repository which now read as > >> > >> Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. > >> > >> -Joe > >> > >> > > > > This webrev (against the current hotspot-rt tree) fixes the copyright issues, > > including the template files Joe mentions and the missing trailing commas as well as > > providing some copyright year updates present in OpenJDK6 but not HotSpot. > > > > http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ > > > > Erik, feel free to assign this a bug ID and push it through JPRT if it helps. > > > > Joe, a webrev for the OpenJDK6 hs19 merge is at: > > > > http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ > > > > Please let me know if I can push this. > > > > Thanks, > > > > Hi Andrew. > > I won't get a chance to look at this until after JavaOne. > > Thanks, > > -Joe Hi Joe, Any progress on this? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Fri Oct 8 12:18:12 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 08 Oct 2010 12:18:12 -0700 Subject: hs19 import In-Reply-To: <20101008140837.GB1907@rivendell.middle-earth.co.uk> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> <20101008140837.GB1907@rivendell.middle-earth.co.uk> Message-ID: <4CAF6E74.3010306@oracle.com> Dr Andrew John Hughes wrote: > On 09:46 Thu 23 Sep , Joe Darcy wrote: > >> Dr Andrew John Hughes wrote: >> >>> On 08:51 Tue 21 Sep , Joe Darcy wrote: >>> >>> >>>> Erik Trimble wrote: >>>> >>>> >>>>> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: >>>>> >>>>> >>>>>> On 21:37 Wed 15 Sep , Erik Trimble wrote: >>>>>> >>>>>> >>>>>>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>>> I notice that new repositories have appeared for a hs19 stable branch: >>>>>>>> >>>>>>>> http://hg.openjdk.java.net/hsx/hsx19/master/ >>>>>>>> >>>>>>>> Shall we start looking at this with regards to importing it for b21? >>>>>>>> >>>>>>>> >>>>>>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now >>>>>>> starting with Hotspot 20). >>>>>>> >>>>>>> I would consider the hsx19 repos to be stable. There *may* be >>>>>>> additional >>>>>>> development in them, but if so (and I'm not specifically promising >>>>>>> anything), such development will be stabilization only. New feature >>>>>>> development is now in HS20 over in the main JDK7 repos. >>>>>>> >>>>>>> HS19 is now in stabilization (bugfix-only) stage, and is suitable for >>>>>>> work to begin on importing into OpenJDK 6. >>>>>>> >>>>>>> >>>>>>> >>>>>> Thanks for the quick reply, Erik. >>>>>> >>>>>> I've started work on the merge, which is taking a while because of >>>>>> the orthogonal >>>>>> copyright header changes in OpenJDK6 and HotSpot :-( >>>>>> >>>>>> One thing I have noticed is that some headers in hs19 don't have a >>>>>> trailing comma before 'Oracle' >>>>>> and this is also true of the header template: >>>>>> >>>>>> --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 >>>>>> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 >>>>>> 13:01:36.601792981 +0100 >>>>>> @@ -1,4 +1,4 @@ >>>>>> -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. >>>>>> +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. >>>>>> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. >>>>>> >>>>>> Is HotSpot 19 correct or OpenJDK6? >>>>>> >>>>>> >>>>> I think it's both. :-) >>>>> >>>>> >>>>> That is, the correct format for an explicitly stated copyright should be >>>>> >>>>> >>>>> Copyright 2000, Oracle and/or .... >>>>> >>>>> AND >>>>> >>>>> Copyright 2000, 2003, Oracle and/or ... >>>>> >>>>> >>>>> There should be a comma after each date (the second instance implies a >>>>> date range between the two years). >>>>> >>>>> For the %YEARS% substitution in the templates, I don't think it >>>>> matters whether there is a comma. It won't be right after a >>>>> substitution no matter what we do. :-) >>>>> >>>>> >>>>> If you find instances of the the first case where there isn't a proper >>>>> comma inserted, PLEASE let me know. I need to fix it. >>>>> >>>>> >>>>> >>>> Erik, >>>> >>>> Back during the big rebranding push, the GPL templates got updated a few >>>> times: >>>> >>>> 6943119: Rebrand source copyright notices >>>> 6961870: More rebranding fixes for templates/gpl-*-header files >>>> >>>> At the time, I didn't update the templates in the HotSpot repo in an >>>> attempt to avoid future merge issues. However, the templates in HS >>>> should match the templates in the jdk and root repository which now read as >>>> >>>> Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. >>>> >>>> -Joe >>>> >>>> >>>> >>> This webrev (against the current hotspot-rt tree) fixes the copyright issues, >>> including the template files Joe mentions and the missing trailing commas as well as >>> providing some copyright year updates present in OpenJDK6 but not HotSpot. >>> >>> http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ >>> >>> Erik, feel free to assign this a bug ID and push it through JPRT if it helps. >>> >>> Joe, a webrev for the OpenJDK6 hs19 merge is at: >>> >>> http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ >>> >>> Please let me know if I can push this. >>> >>> Thanks, >>> >>> >> Hi Andrew. >> >> I won't get a chance to look at this until after JavaOne. >> >> Thanks, >> >> -Joe >> > > Hi Joe, > > Any progress on this? > Hello. Sorry of the delay. I'm a bit confused with the contents of http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ Why are the Sun -> Oracle copyright changes present here since both HS19 and OpenJDK 6 HS repos have already had the rebranding done? The copyright changes look correct to me. -Joe From ahughes at redhat.com Tue Oct 12 05:37:24 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 12 Oct 2010 13:37:24 +0100 Subject: hs19 import In-Reply-To: <4CAF6E74.3010306@oracle.com> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> <20101008140837.GB1907@rivendell.middle-earth.co.uk> <4CAF6E74.3010306@oracle.com> Message-ID: <20101012123723.GD6208@rivendell.middle-earth.co.uk> On 12:18 Fri 08 Oct , Joe Darcy wrote: > Dr Andrew John Hughes wrote: > > On 09:46 Thu 23 Sep , Joe Darcy wrote: > > > >> Dr Andrew John Hughes wrote: > >> > >>> On 08:51 Tue 21 Sep , Joe Darcy wrote: > >>> > >>> > >>>> Erik Trimble wrote: > >>>> > >>>> > >>>>> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: > >>>>> > >>>>> > >>>>>> On 21:37 Wed 15 Sep , Erik Trimble wrote: > >>>>>> > >>>>>> > >>>>>>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: > >>>>>>> > >>>>>>> > >>>>>>>> I notice that new repositories have appeared for a hs19 stable branch: > >>>>>>>> > >>>>>>>> http://hg.openjdk.java.net/hsx/hsx19/master/ > >>>>>>>> > >>>>>>>> Shall we start looking at this with regards to importing it for b21? > >>>>>>>> > >>>>>>>> > >>>>>>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now > >>>>>>> starting with Hotspot 20). > >>>>>>> > >>>>>>> I would consider the hsx19 repos to be stable. There *may* be > >>>>>>> additional > >>>>>>> development in them, but if so (and I'm not specifically promising > >>>>>>> anything), such development will be stabilization only. New feature > >>>>>>> development is now in HS20 over in the main JDK7 repos. > >>>>>>> > >>>>>>> HS19 is now in stabilization (bugfix-only) stage, and is suitable for > >>>>>>> work to begin on importing into OpenJDK 6. > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>> Thanks for the quick reply, Erik. > >>>>>> > >>>>>> I've started work on the merge, which is taking a while because of > >>>>>> the orthogonal > >>>>>> copyright header changes in OpenJDK6 and HotSpot :-( > >>>>>> > >>>>>> One thing I have noticed is that some headers in hs19 don't have a > >>>>>> trailing comma before 'Oracle' > >>>>>> and this is also true of the header template: > >>>>>> > >>>>>> --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 > >>>>>> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 > >>>>>> 13:01:36.601792981 +0100 > >>>>>> @@ -1,4 +1,4 @@ > >>>>>> -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. > >>>>>> +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. > >>>>>> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > >>>>>> > >>>>>> Is HotSpot 19 correct or OpenJDK6? > >>>>>> > >>>>>> > >>>>> I think it's both. :-) > >>>>> > >>>>> > >>>>> That is, the correct format for an explicitly stated copyright should be > >>>>> > >>>>> > >>>>> Copyright 2000, Oracle and/or .... > >>>>> > >>>>> AND > >>>>> > >>>>> Copyright 2000, 2003, Oracle and/or ... > >>>>> > >>>>> > >>>>> There should be a comma after each date (the second instance implies a > >>>>> date range between the two years). > >>>>> > >>>>> For the %YEARS% substitution in the templates, I don't think it > >>>>> matters whether there is a comma. It won't be right after a > >>>>> substitution no matter what we do. :-) > >>>>> > >>>>> > >>>>> If you find instances of the the first case where there isn't a proper > >>>>> comma inserted, PLEASE let me know. I need to fix it. > >>>>> > >>>>> > >>>>> > >>>> Erik, > >>>> > >>>> Back during the big rebranding push, the GPL templates got updated a few > >>>> times: > >>>> > >>>> 6943119: Rebrand source copyright notices > >>>> 6961870: More rebranding fixes for templates/gpl-*-header files > >>>> > >>>> At the time, I didn't update the templates in the HotSpot repo in an > >>>> attempt to avoid future merge issues. However, the templates in HS > >>>> should match the templates in the jdk and root repository which now read as > >>>> > >>>> Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. > >>>> > >>>> -Joe > >>>> > >>>> > >>>> > >>> This webrev (against the current hotspot-rt tree) fixes the copyright issues, > >>> including the template files Joe mentions and the missing trailing commas as well as > >>> providing some copyright year updates present in OpenJDK6 but not HotSpot. > >>> > >>> http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ > >>> > >>> Erik, feel free to assign this a bug ID and push it through JPRT if it helps. > >>> > >>> Joe, a webrev for the OpenJDK6 hs19 merge is at: > >>> > >>> http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ > >>> > >>> Please let me know if I can push this. > >>> > >>> Thanks, > >>> > >>> > >> Hi Andrew. > >> > >> I won't get a chance to look at this until after JavaOne. > >> > >> Thanks, > >> > >> -Joe > >> > > > > Hi Joe, > > > > Any progress on this? > > > > Hello. > > Sorry of the delay. Sorry, missed this mail for some reason. > I'm a bit confused with the contents of > > http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ > > Why are the Sun -> Oracle copyright changes present here since both HS19 > and OpenJDK 6 HS repos have already had the rebranding done? > > The copyright changes look correct to me. > I don't think that webrevs are the clearest thing for these merges. Suggestions welcome :-) Indeed, hs19 does have the copyright changes. And so they are part of the series of changesets between the tip of the hs19 master repository and what was in OpenJDK6 previously (hs17). So the rebranding was applied again to the OpenJDK6 repository, causing lots of lovely conflicts due to orthogonal copyright changes. This is what allowed me to catch the discrepancies between the two runs I mentioned to Erik. What you're seeing in the webrev is the HotSpot copyright update. changeset: 1772:c18cbe5936b8 user: trims date: Thu May 27 19:08:38 2010 -0700 summary: 6941466: Oracle rebranding changes for Hotspot repositories This is then merged into OpenJDK6 in the merge changeset. changeset: 1958:b69c41ea1764 tag: tip parent: 1586:b23b4c2c0d44 parent: 1957:0803c0f69b51 user: andrew date: Tue Sep 21 14:30:37 2010 +0100 summary: Merge So the webrev is just showing all the changesets in the outgoing queue. I've included these below for reference. comparing with ssh://hg.openjdk.java.net/jdk6/jdk6-gate/hotspot searching for changes changeset: 1587:d47555d7aca8 parent: 1512:c76ca382971b user: jmasa date: Wed Mar 03 08:10:41 2010 -0800 summary: 6910182: CMS: assert(_cursor[j] == _survivor_plab_array[j].end(),"Ctl pt invariant") changeset: 1588:c8a467bf56ad parent: 1511:8911d8c0596f user: coleenp date: Tue Mar 02 12:09:40 2010 -0800 summary: 6914050: jvm assertion "guard pages must be in use" in -Xcomp mode changeset: 1589:4b0f2f4918ed user: xlu date: Wed Mar 10 21:42:26 2010 -0800 summary: 6933402: RFE: Improve PrintSafepointStatistics output to track cleanup time changeset: 1590:12d91eb0f579 parent: 1589:4b0f2f4918ed parent: 1587:d47555d7aca8 user: acorn date: Thu Mar 11 14:41:29 2010 -0500 summary: Merge changeset: 1591:51db1e4b379d parent: 1512:c76ca382971b user: twisti date: Mon Mar 08 04:46:30 2010 -0800 summary: 6932536: JSR 292 modified JDK MethodHandlesTest fails on x86_64 changeset: 1592:7de45b5044c3 user: never date: Tue Mar 09 11:02:39 2010 -0800 summary: 6932270: Allow Java's ELF symtab reader to use separate debuginfo files changeset: 1593:3cf667df43ef parent: 1591:51db1e4b379d user: twisti date: Tue Mar 09 20:16:19 2010 +0100 summary: 6919934: JSR 292 needs to support x86 C1 changeset: 1594:d8e270c4f609 parent: 1592:7de45b5044c3 parent: 1593:3cf667df43ef user: twisti date: Tue Mar 09 23:57:36 2010 -0800 summary: Merge changeset: 1595:c466efa608d5 user: roland date: Fri Mar 05 13:58:34 2010 +0100 summary: 6932496: c1: deoptimization of jsr subroutine fails on sparcv9 changeset: 1596:da06d1795d84 user: twisti date: Thu Mar 11 05:09:20 2010 -0800 summary: 6934089: Zero 32-bit/64kb page fix changeset: 1597:9eba43136cb5 user: twisti date: Tue Mar 16 11:52:17 2010 +0100 summary: 6934494: JSR 292 MethodHandles adapters should be generated into their own CodeBlob changeset: 1598:428a9c451986 user: kvn date: Tue Mar 16 15:35:33 2010 -0700 summary: 6935466: new CodeCache flushing code is not guarded by the flag changeset: 1599:fc2c71045ada user: twisti date: Wed Mar 17 10:22:41 2010 +0100 summary: 6934966: JSR 292 add C1 logic for saved SP over MethodHandle calls changeset: 1600:2484f4d6a54e user: kvn date: Wed Mar 17 10:47:03 2010 -0700 summary: 6935535: String.indexOf() returns incorrect result on x86 with SSE4.2 changeset: 1601:c047da02984c user: never date: Wed Mar 17 16:40:25 2010 -0700 summary: 6930043: C2: SIGSEGV in javasoft.sqe.tests.lang.arr017.arr01702.arr01702.loop_forw(II)I changeset: 1602:76c1d7d13ec5 user: twisti date: Thu Mar 18 09:56:51 2010 +0100 summary: 6932091: JSR 292 x86 code cleanup changeset: 1603:97fe2cc98b1d parent: 1590:12d91eb0f579 parent: 1602:76c1d7d13ec5 user: twisti date: Thu Mar 18 06:36:43 2010 -0700 summary: Merge changeset: 1604:418bc80ce139 tag: hs17-b10 parent: 1496:6c9796468b91 user: mikejwre date: Thu Mar 04 13:50:13 2010 -0800 summary: Added tag jdk7-b85 for changeset 6c9796468b91 changeset: 1605:bf823ef06b4f tag: jdk7-b86 user: trims date: Mon Mar 08 15:50:52 2010 -0800 summary: Added tag hs17-b10 for changeset 418bc80ce139 changeset: 1606:6c94fe3c8df3 parent: 1603:97fe2cc98b1d parent: 1605:bf823ef06b4f user: trims date: Thu Mar 18 16:06:00 2010 -0700 summary: Merge changeset: 1607:2a1472c30599 parent: 1587:d47555d7aca8 user: jcoomes date: Wed Mar 03 14:48:26 2010 -0800 summary: 4396719: Mark Sweep stack overflow on deeply nested Object arrays changeset: 1608:94946bdf36bd parent: 1590:12d91eb0f579 parent: 1607:2a1472c30599 user: apetrusenko date: Mon Mar 15 02:56:45 2010 -0700 summary: Merge changeset: 1609:664ae0c5e0e5 user: johnc date: Thu Mar 11 11:44:43 2010 -0800 summary: 6755988: G1: assert(new_obj != 0 || ... "should be forwarded") changeset: 1610:3f0549ed0c98 user: apetrusenko date: Thu Mar 18 01:48:28 2010 -0700 summary: 6921710: G1: assert(new_finger >= _finger && new_finger < _region_limit,"invariant") changeset: 1611:c385bf94cfb8 user: jcoomes date: Thu Mar 18 13:31:51 2010 -0700 summary: 6935839: excessive marking stack growth during full gcs changeset: 1612:cc98cc548f51 parent: 1606:6c94fe3c8df3 parent: 1611:c385bf94cfb8 user: apetrusenko date: Mon Mar 22 02:40:53 2010 -0700 summary: Merge changeset: 1613:d4197f8d516a user: tonyp date: Thu Mar 18 12:14:59 2010 -0400 summary: 6935821: G1: threads created during marking do not active their SATB queues changeset: 1614:4b58861a3570 parent: 1605:bf823ef06b4f user: mikejwre date: Thu Mar 18 13:52:49 2010 -0700 summary: Added tag jdk7-b86 for changeset bf823ef06b4f changeset: 1615:07226e9eab8f tag: hs18-b01 parent: 1606:6c94fe3c8df3 user: trims date: Thu Mar 18 17:21:54 2010 -0700 summary: 6936366: Fork HS17 to HS18 - renumber Major and build numbers of JVM changeset: 1616:3deb84ecd19d user: trims date: Tue Mar 23 20:28:36 2010 -0700 summary: Added tag hs18-b01 for changeset 07226e9eab8f changeset: 1617:e7e7e36ccdb5 tag: jdk7-b87 parent: 1616:3deb84ecd19d parent: 1614:4b58861a3570 user: trims date: Tue Mar 23 20:37:30 2010 -0700 summary: Merge changeset: 1618:465c39e1fb46 user: mikejwre date: Thu Mar 25 15:05:19 2010 -0700 summary: Added tag jdk7-b87 for changeset e7e7e36ccdb5 changeset: 1619:5c9df1575c39 parent: 1618:465c39e1fb46 parent: 1613:d4197f8d516a user: trims date: Thu Apr 01 16:10:27 2010 -0700 summary: Merge changeset: 1620:096b18156d91 user: trims date: Thu Apr 01 16:15:12 2010 -0700 summary: 6940419: Bump the HS18 build number to 02 changeset: 1621:3b3d12e645e7 parent: 1590:12d91eb0f579 user: coleenp date: Fri Mar 12 10:42:16 2010 -0500 summary: 6929067: Stack guard pages should be removed when thread is detached changeset: 1622:0f6600cee529 user: xlu date: Sat Mar 13 16:32:49 2010 -0800 summary: 6934758: Expose the break down of clean up task time during safepoint. changeset: 1623:21141e23627a parent: 1041:50a95aa4a247 user: dcubed date: Tue Mar 16 17:47:03 2010 -0600 summary: 6923488: 4/4 need minor tweaks to HotSpot build for Cygwin changeset: 1624:cd20a6f46fec parent: 1622:0f6600cee529 parent: 1623:21141e23627a user: dcubed date: Tue Mar 16 20:47:17 2010 -0700 summary: Merge changeset: 1625:e392695de029 user: fparain date: Wed Mar 17 11:01:05 2010 +0100 summary: 6935224: Adding new DTrace probes to work with Palantir changeset: 1626:98ba8ca25feb user: coleenp date: Thu Mar 18 16:47:37 2010 -0400 summary: 6936168: Recent fix for unmapping stack guard pages doesn't close /proc/self/maps changeset: 1627:5d393243d487 parent: 1626:98ba8ca25feb parent: 1524:4f7af0dc447b user: dcubed date: Tue Mar 23 17:29:13 2010 -0700 summary: Merge changeset: 1628:39e409a664b3 parent: 1623:21141e23627a user: dcubed date: Thu Mar 25 16:27:12 2010 -0700 summary: 6938185: 3/4 6923488 breaks Windows command shell builds changeset: 1629:84043c7507b9 parent: 1627:5d393243d487 parent: 1628:39e409a664b3 user: dcubed date: Thu Mar 25 16:54:59 2010 -0700 summary: Merge changeset: 1630:4a9cc99938e3 parent: 1629:84043c7507b9 parent: 1612:cc98cc548f51 user: acorn date: Fri Mar 26 11:10:26 2010 -0400 summary: Merge changeset: 1631:7c358fbb6a84 parent: 1630:4a9cc99938e3 parent: 1613:d4197f8d516a user: acorn date: Thu Apr 01 11:23:01 2010 -0400 summary: Merge changeset: 1632:4b60f23c4223 tag: hs18-b02 tag: jdk7-b88 parent: 1631:7c358fbb6a84 parent: 1620:096b18156d91 user: acorn date: Thu Apr 01 20:48:50 2010 -0400 summary: Merge changeset: 1633:fdd57634910e parent: 1603:97fe2cc98b1d user: never date: Thu Mar 18 14:31:41 2010 -0700 summary: 6926979: should simplify catch_inline_exception changeset: 1634:747d26efc5fa user: twisti date: Tue Mar 30 00:57:55 2010 -0700 summary: 6939180: Zero locking fix changeset: 1635:47742b654fcb user: twisti date: Wed Mar 31 08:03:33 2010 -0700 summary: 6939731: JSR 292 Zero build fix after 6934494 changeset: 1636:f61d795ce6de parent: 1634:747d26efc5fa user: never date: Wed Mar 31 11:54:03 2010 -0700 summary: 6939845: zero needs fallback path in C++ interpreter for platform dependent fast bytecodes changeset: 1637:7f4deda46b04 parent: 1636:f61d795ce6de parent: 1635:47742b654fcb user: never date: Wed Mar 31 16:29:10 2010 -0700 summary: Merge changeset: 1638:547cbe6dacc5 user: never date: Thu Apr 01 16:06:57 2010 -0700 summary: 6936709: AsyncGetCallTrace doesn't handle inexact stack walking properly changeset: 1639:1c9c45172908 user: kvn date: Fri Apr 02 11:55:00 2010 -0700 summary: 6939804: ciConstant::print() prints incorrect bool value changeset: 1640:9bb91718aaf2 parent: 1632:4b60f23c4223 parent: 1639:1c9c45172908 user: kvn date: Fri Apr 02 15:55:04 2010 -0700 summary: Merge changeset: 1641:b5d78a3b8843 parent: 1284:455105fc81d9 user: kvn date: Thu Dec 03 14:20:22 2009 -0800 summary: 6892265: System.arraycopy unable to reference elements beyond Integer.MAX_VALUE bytes changeset: 1642:ae4032fb0a5b user: kvn date: Thu Jan 21 10:07:59 2010 -0800 summary: 6894807: No ClassCastException for HashAttributeSet constructors if run with -Xcomp changeset: 1643:0c3f888b7636 parent: 1641:b5d78a3b8843 user: acorn date: Tue Jan 19 16:03:09 2010 -0500 summary: 6626217: Fixed loader constraint array handling changeset: 1644:3d531bbe5917 parent: 1643:0c3f888b7636 parent: 1642:ae4032fb0a5b user: acorn date: Thu Jan 28 13:59:18 2010 -0500 summary: Merge changeset: 1645:f5dd08ad65df user: acorn date: Mon Mar 15 15:51:36 2010 -0400 summary: 6932480: Fix crash in CompilerThread/Parser. Unloaded array klass? changeset: 1646:09ac706c2623 parent: 1645:f5dd08ad65df parent: 1605:bf823ef06b4f user: asaha date: Wed Mar 24 17:16:33 2010 -0700 summary: Merge changeset: 1647:895d9ade6111 parent: 1640:9bb91718aaf2 parent: 1646:09ac706c2623 user: asaha date: Tue Apr 06 22:06:57 2010 -0700 summary: Merge changeset: 1648:a2ea687fdc7c parent: 1630:4a9cc99938e3 user: coleenp date: Wed Mar 31 16:51:18 2010 -0700 summary: 6938627: Make temporary directory use property java.io.tmpdir when specified changeset: 1649:0fd6320854d3 parent: 1648:a2ea687fdc7c parent: 1632:4b60f23c4223 user: jcoomes date: Fri Apr 02 17:04:09 2010 -0700 summary: Merge changeset: 1650:6ccd32c284ac parent: 1647:895d9ade6111 parent: 1649:0fd6320854d3 user: kamg date: Wed Apr 07 12:28:22 2010 -0400 summary: Merge changeset: 1651:56507bcd639e parent: 1632:4b60f23c4223 user: tonyp date: Tue Mar 30 15:36:55 2010 -0400 summary: 6937160: G1: should observe GCTimeRatio changeset: 1652:781e29eb8e08 user: tonyp date: Fri Apr 02 12:10:08 2010 -0400 summary: 6677708: G1: re-enable parallel RSet updating and scanning changeset: 1653:72f725c5a7be user: tonyp date: Mon Apr 05 12:19:22 2010 -0400 summary: 6940310: G1: MT-unsafe calls to CM::region_stack_push() / CM::region_stack_pop() changeset: 1654:23b1b27ac76c user: tonyp date: Tue Apr 06 10:59:45 2010 -0400 summary: 6909756: G1: guarantee(G1CollectedHeap::heap()->mark_in_progress(),"Precondition.") changeset: 1655:bda703475ded user: johnc date: Wed Apr 07 11:43:53 2010 -0700 summary: 6940894: G1: assert(new_obj != 0 || ... "should be forwarded") for compaction tests changeset: 1656:6b73e879f1c2 parent: 1647:895d9ade6111 parent: 1655:bda703475ded user: tonyp date: Fri Apr 09 13:08:34 2010 -0400 summary: Merge changeset: 1657:e4c77b879561 parent: 1650:6ccd32c284ac parent: 1656:6b73e879f1c2 user: tonyp date: Fri Apr 09 15:01:49 2010 -0700 summary: Merge changeset: 1658:ed4f78aa9282 parent: 1640:9bb91718aaf2 user: twisti date: Tue Apr 06 13:39:52 2010 +0200 summary: 6940520: CodeCache::scavenge_root_nmethods_do must fix oop relocations changeset: 1659:0dc88ad3244e user: kvn date: Tue Apr 06 15:18:10 2010 -0700 summary: 6940677: Use 64 bytes chunk copy for arraycopy on Sparc changeset: 1660:6476042f815c user: kvn date: Wed Apr 07 09:37:47 2010 -0700 summary: 6940701: Don't align loops in stubs for Niagara sparc changeset: 1661:b9d85fcdf743 user: kvn date: Wed Apr 07 10:35:56 2010 -0700 summary: 6940733: allocate non static oop fields in super and sub classes together changeset: 1662:9e321dcfa5b7 user: kvn date: Wed Apr 07 12:39:27 2010 -0700 summary: 6940726: Use BIS instruction for allocation prefetch on Sparc changeset: 1663:93767e6a2dfd user: twisti date: Thu Apr 08 10:55:40 2010 +0200 summary: 6941529: SharedRuntime::raw_exception_handler_for_return_address must reset thread MethodHandle flag changeset: 1664:0a43776437b6 user: iveresov date: Thu Apr 08 12:13:07 2010 -0700 summary: 6942223: c1 64 bit fixes changeset: 1665:213fbcf54799 parent: 1647:895d9ade6111 parent: 1664:0a43776437b6 user: jrose date: Thu Apr 08 17:45:20 2010 -0700 summary: Merge changeset: 1666:fc3cd2277dc7 parent: 1657:e4c77b879561 parent: 1665:213fbcf54799 user: jrose date: Tue Apr 13 13:01:37 2010 -0700 summary: Merge changeset: 1667:3f12a94552cc parent: 1632:4b60f23c4223 user: mikejwre date: Thu Apr 08 17:02:41 2010 -0700 summary: Added tag jdk7-b88 for changeset 4b60f23c4223 changeset: 1668:5b29c2368d93 parent: 1632:4b60f23c4223 parent: 1646:09ac706c2623 user: lana date: Thu Apr 08 15:28:37 2010 -0700 summary: Merge changeset: 1669:15836273ac24 tag: jdk7-b89 parent: 1667:3f12a94552cc parent: 1668:5b29c2368d93 user: lana date: Tue Apr 13 16:36:27 2010 -0700 summary: Merge changeset: 1670:4c78b7c16824 user: trims date: Thu Apr 15 19:08:18 2010 -0700 summary: 6944398: Bump the HS18 build number to 03 changeset: 1671:e16cca0aa5e1 parent: 1670:4c78b7c16824 parent: 1666:fc3cd2277dc7 user: trims date: Thu Apr 15 19:08:48 2010 -0700 summary: Merge changeset: 1672:25f53b53aaa3 tag: hs18-b03 user: trims date: Thu Apr 15 19:09:48 2010 -0700 summary: Added tag hs18-b02 for changeset 4b60f23c4223 changeset: 1673:765578777b6e parent: 1669:15836273ac24 user: mikejwre date: Thu Apr 15 13:54:54 2010 -0700 summary: Added tag jdk7-b89 for changeset 15836273ac24 changeset: 1674:605c9707a766 tag: jdk7-b90 parent: 1672:25f53b53aaa3 parent: 1673:765578777b6e user: trims date: Tue Apr 20 21:38:23 2010 -0700 summary: Merge changeset: 1675:ef74d6d1ac1e parent: 1666:fc3cd2277dc7 user: never date: Wed Apr 14 15:30:13 2010 -0700 summary: 6938026: C2 compiler fails in Node::rematerialize()const changeset: 1676:9f5b60a14736 user: never date: Thu Apr 15 18:14:49 2010 -0700 summary: 6939930: exception unwind changes in 6919934 hurts compilation speed changeset: 1677:f9271ff9d324 parent: 1675:ef74d6d1ac1e user: twisti date: Thu Apr 15 02:40:12 2010 -0700 summary: 6941224: Improved stack overflow handling for Zero changeset: 1678:badea972a310 parent: 1676:9f5b60a14736 parent: 1677:f9271ff9d324 user: twisti date: Fri Apr 16 00:52:45 2010 -0700 summary: Merge changeset: 1679:a9584793da0f parent: 1675:ef74d6d1ac1e user: twisti date: Thu Apr 15 03:13:56 2010 -0700 summary: 6944028: 6940701 broke Zero changeset: 1680:d32d2a2f62cd parent: 1678:badea972a310 parent: 1679:a9584793da0f user: twisti date: Fri Apr 16 02:59:34 2010 -0700 summary: Merge changeset: 1681:aa9c266de52a user: twisti date: Fri Apr 16 05:05:53 2010 -0700 summary: 6944473: 6941224 misses new files changeset: 1682:c544d979f886 user: twisti date: Mon Apr 19 02:13:06 2010 -0700 summary: 6944503: Improved Zero crash dump changeset: 1683:bc32f286fae0 user: never date: Tue Apr 20 13:26:33 2010 -0700 summary: 6945219: minor SA fixes changeset: 1684:ba07d5be2d51 parent: 1683:bc32f286fae0 parent: 1674:605c9707a766 user: jrose date: Wed Apr 21 01:13:15 2010 -0700 summary: Merge changeset: 1685:0bfd3fb24150 parent: 1656:6b73e879f1c2 user: jmasa date: Tue Apr 13 13:52:10 2010 -0700 summary: 6858496: Clear all SoftReferences before an out-of-memory due to GC overhead limit. changeset: 1686:7666957bc44d user: tonyp date: Tue Mar 30 15:43:03 2010 -0400 summary: 6937142: G1: improvements to debugging output (S-M) changeset: 1687:5dbd9300cf9c user: johnc date: Thu Apr 15 15:52:55 2010 -0700 summary: 6943926: G1: Integer overflow during heap region verification changeset: 1688:f9ec1e4bbb44 user: tonyp date: Thu Apr 15 18:45:30 2010 -0400 summary: 6939027: G1: assertion failure during the concurrent phase of cleanup changeset: 1689:79e419e5ea3b user: apetrusenko date: Fri Apr 16 08:48:16 2010 -0700 summary: 6942253: G1: replace G1ParallelGCAllocBufferSize with YoungPLABSize and OldPLABSize changeset: 1690:bdb5361c461c parent: 1688:f9ec1e4bbb44 user: kevinw date: Fri Apr 16 17:36:37 2010 +0100 summary: 6897143: Stress test crashes during HeapInspection using ParallelGC. changeset: 1691:6ecb6e6de3d6 parent: 1689:79e419e5ea3b parent: 1690:bdb5361c461c user: kevinw date: Mon Apr 19 05:40:21 2010 -0700 summary: Merge changeset: 1692:1316cec51b4d user: johnc date: Thu Apr 22 10:02:38 2010 -0700 summary: 6819061: G1: eliminate serial Other times that are proportional to the collection set length changeset: 1693:454ff03c0daf parent: 1684:ba07d5be2d51 parent: 1692:1316cec51b4d user: tonyp date: Mon Apr 26 18:01:55 2010 -0400 summary: Merge changeset: 1694:d7f654633cfe parent: 1683:bc32f286fae0 user: never date: Mon Apr 26 11:27:21 2010 -0700 summary: 6946040: add intrinsic for short and char reverseBytes changeset: 1695:b4776199210f user: never date: Mon Apr 26 23:59:45 2010 -0700 summary: 6943485: JVMTI always on capabilities change code generation too much changeset: 1696:314e17ca2c23 user: iveresov date: Tue Apr 27 11:19:12 2010 -0700 summary: 6946892: c1 shouldn't sign-extend to upper 32bits on x64 changeset: 1697:90acda19b80f parent: 1693:454ff03c0daf parent: 1696:314e17ca2c23 user: jrose date: Thu Apr 29 00:03:40 2010 -0700 summary: Merge changeset: 1698:615a9d95d265 parent: 1693:454ff03c0daf user: johnc date: Tue Apr 27 18:13:47 2010 -0700 summary: 6946056: assert((intptr_t) sp()<=(intptr_t) result,"result must>=than stack pointer"), frame_x86.cpp:295 changeset: 1699:cff162798819 user: jcoomes date: Sun Oct 11 16:19:25 2009 -0700 summary: 6888953: some calls to function-like macros are missing semicolons changeset: 1700:f03d0a26bf83 user: jcoomes date: Thu Apr 22 13:23:15 2010 -0700 summary: 6888954: argument formatting for assert() and friends changeset: 1701:befdf73d6b82 parent: 1697:90acda19b80f parent: 1700:f03d0a26bf83 user: tonyp date: Mon May 03 16:31:07 2010 -0400 summary: Merge changeset: 1702:e0a1a502e402 tag: jdk7-b91 parent: 1674:605c9707a766 user: mikejwre date: Thu Apr 22 16:54:23 2010 -0700 summary: Added tag jdk7-b90 for changeset 605c9707a766 changeset: 1703:7b03170e1fcb parent: 1702:e0a1a502e402 parent: 1697:90acda19b80f user: trims date: Thu Apr 29 15:18:27 2010 -0700 summary: Merge changeset: 1704:310cdbc35535 tag: hs18-b04 user: trims date: Thu Apr 29 15:47:28 2010 -0700 summary: 6948636: Bump the HS18 build number to 04 changeset: 1705:03a8443caa4b parent: 1702:e0a1a502e402 user: mikejwre date: Thu Apr 29 14:32:43 2010 -0700 summary: Added tag jdk7-b91 for changeset e0a1a502e402 changeset: 1706:e3fa0cc77f74 parent: 1704:310cdbc35535 parent: 1705:03a8443caa4b user: trims date: Tue May 04 12:23:38 2010 -0700 summary: Merge changeset: 1707:3221d1887d30 tag: jdk7-b92 user: trims date: Tue May 04 12:25:39 2010 -0700 summary: Added tag hs18-b03 for changeset 25f53b53aaa3 changeset: 1708:731bcbe3c9c4 user: trims date: Thu May 06 12:46:21 2010 -0700 summary: 6950438: Add 6u18 and 6u20 release values explicitly to jprt.properties file changeset: 1709:5dabb4e73380 parent: 1708:731bcbe3c9c4 parent: 1701:befdf73d6b82 user: trims date: Thu May 06 13:03:03 2010 -0700 summary: Merge changeset: 1710:fd3de7134574 parent: 1707:3221d1887d30 user: mikejwre date: Thu May 06 18:25:58 2010 -0700 summary: Added tag jdk7-b92 for changeset 3221d1887d30 changeset: 1711:80ccc94456b2 parent: 1710:fd3de7134574 parent: 1709:5dabb4e73380 user: trims date: Fri May 07 15:12:28 2010 -0700 summary: Merge changeset: 1712:359375cb7de6 user: trims date: Fri May 07 15:13:00 2010 -0700 summary: Added tag hs18-b04 for changeset 310cdbc35535 changeset: 1713:e8e83be27dd7 user: never date: Mon May 10 14:58:38 2010 -0700 summary: 6951190: assert(!klass_is_exact(),"only non-exact klass") while building JDK changeset: 1714:96d554193f72 parent: 1650:6ccd32c284ac user: coleenp date: Mon Apr 19 18:58:31 2010 -0400 summary: 6944822: Fix for 6938627 exposes problem with hard-coded buffer sizes changeset: 1715:77261afdc5f2 user: coleenp date: Tue May 04 15:12:08 2010 -0400 summary: 6935118: UseCompressedOops modification in methodOopDesc::sort_methods() causes JCK timeout changeset: 1716:f43b5e9f7881 user: kamg date: Wed May 05 09:28:13 2010 -0400 summary: 6949118: jvm.dll shows the company name as Sun Microsystems changeset: 1717:3fca8e9cd36a parent: 1701:befdf73d6b82 parent: 1716:f43b5e9f7881 user: dcubed date: Wed May 05 16:39:47 2010 -0700 summary: Merge changeset: 1718:4ad4e0ee3779 parent: 1717:3fca8e9cd36a parent: 1712:359375cb7de6 user: dcubed date: Mon May 10 13:09:44 2010 -0700 summary: Merge changeset: 1719:2ad074ba8456 parent: 1718:4ad4e0ee3779 parent: 1713:e8e83be27dd7 user: dcubed date: Tue May 11 17:41:11 2010 -0700 summary: Merge changeset: 1720:c640000b7cc1 parent: 1697:90acda19b80f user: twisti date: Thu Apr 29 06:30:25 2010 -0700 summary: 6829193: JSR 292 needs to support SPARC changeset: 1721:ae8f909e5fc7 user: iveresov date: Thu Apr 29 17:53:58 2010 -0700 summary: 6948602: Disable use of SSE4.2 in String.indexOf intrinsic until 6942326 is fixed changeset: 1722:0c5b3cf3c1f5 user: twisti date: Fri Apr 30 04:27:25 2010 -0700 summary: 6939182: Zero JNI handles fix changeset: 1723:2338d41fbd81 user: twisti date: Fri Apr 30 08:37:24 2010 -0700 summary: 6943304: remove tagged stack interpreter changeset: 1724:cd5dbf694d45 user: jrose date: Sat May 01 02:42:18 2010 -0700 summary: 6939134: JSR 292 adjustments to method handle invocation changeset: 1725:2ffde6cfe049 user: jrose date: Sat May 01 21:57:35 2010 -0700 summary: 6939196: method handle signatures off the boot class path get linkage errors changeset: 1726:68d6683eaef7 user: twisti date: Tue May 04 02:33:59 2010 -0700 summary: 6949423: remove tagged stack interpreter for Zero changeset: 1727:d6e880569997 user: twisti date: Wed May 05 05:57:21 2010 -0700 summary: 6949830: 6939134 broke Zero changeset: 1728:348346af6676 user: twisti date: Thu May 06 02:09:18 2010 -0700 summary: 6950178: Zero stack improvements changeset: 1729:6cfbdb113e52 user: twisti date: Fri May 07 04:20:56 2010 -0700 summary: 6950617: Zero/Shark interface updates changeset: 1730:df736661d0c8 parent: 1713:e8e83be27dd7 parent: 1729:6cfbdb113e52 user: jrose date: Tue May 11 15:19:19 2010 -0700 summary: Merge changeset: 1731:22af4ce8dba1 user: twisti date: Wed May 12 03:49:52 2010 -0700 summary: 6951784: Zero deoptimizer changes changeset: 1732:ef1a1d051971 parent: 1719:2ad074ba8456 parent: 1731:22af4ce8dba1 user: jrose date: Wed May 12 22:06:02 2010 -0700 summary: Merge changeset: 1733:3bfae429e2cf parent: 1700:f03d0a26bf83 user: ysr date: Mon May 03 10:24:51 2010 -0700 summary: 6948537: CMS: BOT walkers observe out-of-thin-air zeros on sun4v sparc/CMT changeset: 1734:7145628c2fa2 parent: 1701:befdf73d6b82 parent: 1733:3bfae429e2cf user: tonyp date: Mon May 03 17:23:58 2010 -0400 summary: Merge changeset: 1735:bb843ebc7c55 user: ysr date: Mon May 03 20:19:05 2010 -0700 summary: 6919638: CMS: ExplicitGCInvokesConcurrent misinteracts with gc locker changeset: 1736:a8127dc669ba user: ysr date: Mon May 10 12:31:52 2010 -0700 summary: 6951188: CMS: move PromotionInfo into its own file changeset: 1737:67d74f7a15d9 user: jcoomes date: Wed May 12 10:28:13 2010 -0700 summary: 6951923: some uses of fatal1 were missed by 6888954 changeset: 1738:8bfe9058ca46 tag: hs19-b01 parent: 1737:67d74f7a15d9 parent: 1732:ef1a1d051971 user: jcoomes date: Thu May 13 13:05:47 2010 -0700 summary: Merge changeset: 1739:fb57d4cf76c2 parent: 1707:3221d1887d30 user: prr date: Tue May 11 14:35:43 2010 -0700 summary: 6931180: Migration to recent versions of MS Platform SDK changeset: 1740:9d865fc2f644 tag: jdk7-b93 parent: 1710:fd3de7134574 parent: 1739:fb57d4cf76c2 user: mikejwre date: Wed May 12 17:19:41 2010 -0700 summary: Merge changeset: 1741:2fb8834f4446 parent: 1732:ef1a1d051971 parent: 1740:9d865fc2f644 user: trims date: Thu May 13 14:35:14 2010 -0700 summary: Merge changeset: 1742:eefa1a6f1582 user: trims date: Thu May 13 14:47:21 2010 -0700 summary: 6952178: Fork HS18 to HS19 - renumber Major and build numbers of JVM changeset: 1743:093432aa7573 parent: 1742:eefa1a6f1582 parent: 1738:8bfe9058ca46 user: trims date: Thu May 13 17:10:32 2010 -0700 summary: Merge changeset: 1744:9d4dd91c4a0a parent: 1718:4ad4e0ee3779 user: poonam date: Sat May 15 18:24:34 2010 -0700 summary: 6745217: jmap assertion failure changeset: 1745:7ccc203eb6ff parent: 1743:093432aa7573 parent: 1744:9d4dd91c4a0a user: dcubed date: Mon May 17 03:53:55 2010 -0700 summary: Merge changeset: 1746:892898e961c5 parent: 1745:7ccc203eb6ff parent: 1549:d3562366cbfd user: dcubed date: Mon May 17 07:11:27 2010 -0700 summary: Merge changeset: 1747:79bf863697eb parent: 1732:ef1a1d051971 user: kvn date: Mon May 17 11:32:56 2010 -0700 summary: 6951686: Using large pages on Linux prevents zero based compressed oops changeset: 1748:bfe29ec02863 user: never date: Mon May 17 16:50:07 2010 -0700 summary: 6950075: nmethod sweeper should operate concurrently changeset: 1749:c52275c698d1 user: kvn date: Tue May 18 09:54:05 2010 -0700 summary: 6953267: assert in EA code with -XX:+StressReflectiveCode changeset: 1750:99791ad65936 user: never date: Tue May 18 13:45:03 2010 -0700 summary: 6953539: after 6892658 c1 reports that it doesn't inline StringBuffer.append changeset: 1751:b5fdf39b9749 user: never date: Tue May 18 23:58:32 2010 -0700 summary: 6953576: bottom_type for matched AddPNodes doesn't always agree with ideal changeset: 1752:eb79484f795f parent: 1640:9bb91718aaf2 user: kvn date: Mon Apr 05 10:17:15 2010 -0700 summary: 6937111: Restore optimization for Phi of AddP (6552204) changeset: 1753:1a1603f975b5 parent: 1752:eb79484f795f parent: 1751:b5fdf39b9749 user: kvn date: Wed May 19 10:22:39 2010 -0700 summary: Merge changeset: 1754:1a88d3c58e1d parent: 1746:892898e961c5 parent: 1753:1a1603f975b5 user: jrose date: Thu May 20 01:34:22 2010 -0700 summary: Merge changeset: 1755:cc387008223e parent: 1738:8bfe9058ca46 user: apetrusenko date: Fri May 14 10:28:46 2010 -0700 summary: 6921317: (partial) G1: assert(top() == bottom() || zfs == Allocated,"Region must be empty, or we must be setting it to changeset: 1756:a00b51b2dda4 user: ysr date: Mon May 17 00:47:28 2010 -0700 summary: 6948539: CMS+UseCompressedOops: placement of cms_free bit interferes with promoted object link changeset: 1757:fb1a39993f69 user: jcoomes date: Tue May 18 11:02:18 2010 -0700 summary: 6951319: enable solaris builds using Sun Studio 12 update 1 changeset: 1758:15190cbcabe9 user: ysr date: Wed May 19 10:37:05 2010 -0700 summary: 6953483: Typo related to ReduceInitialCardMarks leaves concurrent collectors vulnerable to heap corruption changeset: 1759:1634cec09505 user: ysr date: Wed May 19 16:05:47 2010 -0700 summary: 6953952: collectedHeap.cpp should use #ifdef _LP64 not LP64 changeset: 1760:c9a07413e82b parent: 1754:1a88d3c58e1d parent: 1759:1634cec09505 user: jcoomes date: Thu May 20 08:32:11 2010 -0700 summary: Merge changeset: 1761:e40a3601bc1f parent: 1746:892898e961c5 user: kamg date: Wed May 19 10:19:10 2010 -0400 summary: 6911922: JVM must throw VerifyError for jsr or jsr_w opcodes in class file v.51+ changeset: 1762:3548f3198dca parent: 1760:c9a07413e82b parent: 1761:e40a3601bc1f user: dcubed date: Wed May 26 14:16:55 2010 -0700 summary: Merge changeset: 1763:62c1088d26fc parent: 1740:9d865fc2f644 user: mikejwre date: Thu May 13 13:22:12 2010 -0700 summary: Added tag jdk7-b93 for changeset 9d865fc2f644 changeset: 1764:5488b2963a50 parent: 1763:62c1088d26fc parent: 1743:093432aa7573 user: trims date: Tue May 18 14:10:01 2010 -0700 summary: Merge changeset: 1765:215de60567b1 user: trims date: Fri May 21 14:01:44 2010 -0700 summary: Added tag hs19-b01 for changeset 8bfe9058ca46 changeset: 1766:daf617c34be6 parent: 1740:9d865fc2f644 user: prr date: Wed May 19 10:21:41 2010 -0700 summary: 6953588: hotspot\src\share\vm\interpreter\bytecodes.cpp doesn't compile with VS2010 on AMD64 changeset: 1767:d38f45079fe9 tag: jdk7-b94 parent: 1764:5488b2963a50 parent: 1766:daf617c34be6 user: mikejwre date: Wed May 19 20:16:16 2010 -0700 summary: Merge changeset: 1768:b1f1fb382940 user: mikejwre date: Thu May 20 16:00:15 2010 -0700 summary: Added tag jdk7-b94 for changeset d38f45079fe9 changeset: 1769:91d861ba858d tag: jdk7-b95 parent: 1765:215de60567b1 parent: 1768:b1f1fb382940 user: trims date: Fri May 21 14:03:49 2010 -0700 summary: Merge changeset: 1770:503a1a5856f1 user: trims date: Thu May 27 12:40:34 2010 -0700 summary: 6956513: Bump the HS19 build number to 02 changeset: 1771:7c6ae41266c5 parent: 1770:503a1a5856f1 parent: 1760:c9a07413e82b user: trims date: Thu May 27 12:42:44 2010 -0700 summary: Merge changeset: 1772:c18cbe5936b8 user: trims date: Thu May 27 19:08:38 2010 -0700 summary: 6941466: Oracle rebranding changes for Hotspot repositories changeset: 1773:2b554795d0f4 parent: 1769:91d861ba858d user: mikejwre date: Thu May 27 10:57:13 2010 -0700 summary: Added tag jdk7-b95 for changeset 91d861ba858d changeset: 1774:573e8ea5fd68 tag: hs19-b02 tag: jdk7-b96 parent: 1772:c18cbe5936b8 parent: 1773:2b554795d0f4 user: trims date: Tue Jun 01 11:28:04 2010 -0700 summary: Merge changeset: 1775:dfe27f03244a parent: 1774:573e8ea5fd68 parent: 1762:3548f3198dca user: trims date: Tue Jun 01 11:48:33 2010 -0700 summary: Merge changeset: 1776:1a5913bf5e19 parent: 1754:1a88d3c58e1d user: twisti date: Thu May 20 06:34:23 2010 -0700 summary: 6951083: oops and relocations should part of nmethod not CodeBlob changeset: 1777:61b2245abf36 user: twisti date: Fri May 21 02:59:24 2010 -0700 summary: 6930772: JSR 292 needs to support SPARC C1 changeset: 1778:ab102d5d923e user: jrose date: Sun May 23 01:38:26 2010 -0700 summary: 6939207: refactor constant pool index processing changeset: 1779:9f669cf29cb0 parent: 1760:c9a07413e82b parent: 1778:ab102d5d923e user: jrose date: Mon May 24 14:15:14 2010 -0700 summary: Merge changeset: 1780:110501f54a99 user: twisti date: Tue May 25 02:38:48 2010 -0700 summary: 6934104: JSR 292 needs to support SPARC C2 changeset: 1781:1747f04ad0c4 parent: 1778:ab102d5d923e user: never date: Mon May 24 13:53:38 2010 -0700 summary: 6490487: java support on 64 bit solaris x86 machines is broken. changeset: 1782:f9a202dd8899 parent: 1781:1747f04ad0c4 parent: 1780:110501f54a99 user: never date: Tue May 25 13:18:49 2010 -0700 summary: Merge changeset: 1783:de91a2f25c7e user: jrose date: Thu May 27 09:54:07 2010 -0700 summary: 6956164: nightly regressions from 6939207 changeset: 1784:2d127394260e user: kvn date: Thu May 27 18:01:56 2010 -0700 summary: 6916623: Align object to 16 bytes to use Compressed Oops with java heap up to 64Gb changeset: 1785:87fc6aca31ab user: iveresov date: Thu May 27 22:01:55 2010 -0700 summary: 6955349: C1: Make G1 barriers work with x64 changeset: 1786:beb77f0d41b3 user: jrose date: Fri May 28 16:23:51 2010 -0700 summary: 6957004: MethodComparator uses the wrong CP index accessor changeset: 1787:1eb493f33423 user: jrose date: Sat May 29 19:22:32 2010 -0700 summary: 6957080: MethodComparator needs stress testing changeset: 1788:3657cb01ffc5 user: kvn date: Wed Jun 02 09:49:32 2010 -0700 summary: 6954029: Improve implicit null check generation with compressed oops changeset: 1789:4a2e260bb13a user: kvn date: Wed Jun 02 12:02:49 2010 -0700 summary: 6957882: nsk/sajdi tests failed with NullPointerException changeset: 1790:852d0157c696 user: never date: Wed Jun 02 14:23:23 2010 -0700 summary: 6956931: assert(SafepointSynchronize::is_at_safepoint()) failed: must be executed at a safepoint changeset: 1791:ca3dceda776c user: never date: Wed Jun 02 20:15:33 2010 -0700 summary: 6930994: Code cache is full warning should be visible in product changeset: 1792:e9ff18c4ace7 parent: 1775:dfe27f03244a parent: 1791:ca3dceda776c user: jrose date: Wed Jun 02 22:45:42 2010 -0700 summary: Merge changeset: 1793:02e771df338e user: kvn date: Thu Jun 03 14:20:27 2010 -0700 summary: 6958254: -XX:+VerifyOops is broken on x86 changeset: 1794:b812ff5abc73 user: iveresov date: Fri Jun 04 11:18:04 2010 -0700 summary: 6958292: C1: Enable parallel compilation changeset: 1795:49fac4acd688 user: never date: Mon Jun 07 14:17:01 2010 -0700 summary: 6958485: fix for 6879921 was insufficient changeset: 1796:086d73ccd6c0 parent: 1762:3548f3198dca user: kamg date: Thu May 27 17:06:39 2010 -0400 summary: 6930553: classfile format checker allows invalid method descriptor in CONSTANT_NameAndType_info in some cases changeset: 1797:b96a3e44582f parent: 1762:3548f3198dca user: acorn date: Thu Jun 03 13:21:47 2010 -0400 summary: 6852873: Reduce safepoint cleanup time changeset: 1798:be0d50d3de2a parent: 1796:086d73ccd6c0 parent: 1797:b96a3e44582f user: acorn date: Thu Jun 03 13:34:47 2010 -0400 summary: Merge changeset: 1799:3a9de63b2209 parent: 1798:be0d50d3de2a parent: 1792:e9ff18c4ace7 user: coleenp date: Fri Jun 04 17:44:51 2010 -0400 summary: Merge changeset: 1800:b17deadc902e parent: 1799:3a9de63b2209 parent: 1795:49fac4acd688 user: coleenp date: Wed Jun 09 13:53:58 2010 -0400 summary: Merge changeset: 1801:f16f1d7893de parent: 1760:c9a07413e82b user: johnc date: Mon May 24 17:11:22 2010 -0700 summary: 6941378: G1: change default value of G1UseFixedWindowMMUTracker to true changeset: 1802:5b77884bd4b7 user: jcoomes date: Thu May 27 13:09:56 2010 -0700 summary: 6956472: test/runtime/6888954/vmerrors.sh uses ksh-specific syntax changeset: 1803:2458a1f25356 user: johnc date: Mon Jun 07 17:46:04 2010 -0700 summary: 6953058: G1: A bigapp crashes with SIGSEGV in compiled code changeset: 1804:b9bc732be7c0 parent: 1800:b17deadc902e parent: 1803:2458a1f25356 user: jmasa date: Thu Jun 10 08:27:35 2010 -0700 summary: Merge changeset: 1805:136b78722a08 parent: 1795:49fac4acd688 user: jrose date: Wed Jun 09 18:50:45 2010 -0700 summary: 6939203: JSR 292 needs method handle constants changeset: 1806:d93949c5bdcc user: kvn date: Thu Jun 10 13:04:20 2010 -0700 summary: 6730276: JDI_REGRESSION tests fail with "Error: count must be non-zero" error on x86 changeset: 1807:b918d354830a user: jrose date: Sat Jun 12 22:53:43 2010 -0700 summary: 6960865: ldc of unloaded class throws an assert in ciTypeFlow changeset: 1808:d179e225c164 user: twisti date: Mon Jun 14 00:52:15 2010 -0700 summary: 6960550: Missing semicolon in Zero changeset: 1809:0b4ee1df1b44 parent: 1795:49fac4acd688 user: never date: Tue Jun 15 12:03:15 2010 -0700 summary: 6952176: Remove debug flag from adlc makefile for 6Update trains changeset: 1810:78fc92dfd4ca parent: 1808:d179e225c164 parent: 1809:0b4ee1df1b44 user: never date: Tue Jun 15 12:06:52 2010 -0700 summary: Merge changeset: 1811:2389669474a6 parent: 1804:b9bc732be7c0 parent: 1810:78fc92dfd4ca user: jrose date: Tue Jun 15 15:57:36 2010 -0700 summary: Merge changeset: 1812:4311f23817fd user: kvn date: Tue Jun 15 18:07:27 2010 -0700 summary: 6959430: Make sure raw loads have control edge changeset: 1813:79107c3a6bd5 parent: 1804:b9bc732be7c0 user: tonyp date: Fri May 07 13:14:41 2010 -0400 summary: 6949307: G1: raise a vm error, do not core dump, if target pause time and target interval are inconsistent changeset: 1814:215576b54709 user: tonyp date: Thu Apr 22 15:20:16 2010 -0400 summary: 6946048: G1: improvements to +PrintGCDetails output changeset: 1815:fdde661c8e06 parent: 1804:b9bc732be7c0 user: jmasa date: Wed Jun 23 08:35:31 2010 -0700 summary: 6952853: SIGSEGV with UseAdaptiveGCBoundary on 64b linux running jvm2008 changeset: 1816:0d781caf0cbb parent: 1815:fdde661c8e06 parent: 1814:215576b54709 user: jmasa date: Wed Jun 23 15:17:20 2010 -0700 summary: Merge changeset: 1817:b8537b881421 parent: 1812:4311f23817fd parent: 1816:0d781caf0cbb user: jmasa date: Thu Jun 24 15:56:12 2010 -0700 summary: Merge changeset: 1818:ff38d05ea86f parent: 1812:4311f23817fd user: never date: Fri Jun 18 16:51:54 2010 -0700 summary: 6956958: assert(is_clean() || is_call_to_compiled() || is_call_to_interpreted() || is_optimized() || is_megam changeset: 1819:38e8278318ca user: never date: Mon Jun 21 14:26:17 2010 -0700 summary: 6656830: assert((*p)->is_oop(),"expected an oop while scanning weak refs") changeset: 1820:9887b5e57f9e user: iveresov date: Tue Jun 22 12:10:07 2010 -0700 summary: 6962980: C1: stub area should take into account method handle deopt stub changeset: 1821:5f249b390094 user: kvn date: Wed Jun 23 09:40:11 2010 -0700 summary: 6947341: JVM Crash running Oracle ATG CRMDemo changeset: 1822:5a297ea605c7 parent: 1817:b8537b881421 parent: 1821:5f249b390094 user: jrose date: Sat Jun 26 00:19:55 2010 -0700 summary: Merge changeset: 1823:d678e3277048 parent: 1821:5f249b390094 user: kvn date: Mon Jun 28 10:52:50 2010 -0700 summary: 6964479: widen normalization of small int and long values should be symmetric changeset: 1824:6027dddc26c6 user: kvn date: Mon Jun 28 14:54:39 2010 -0700 summary: 6677629: PhaseIterGVN::subsume_node() should call hash_delete() and add_users_to_worklist() changeset: 1825:76efbe666d6c user: kvn date: Tue Jun 29 10:34:00 2010 -0700 summary: 6964774: Adjust optimization flags setting changeset: 1826:fcbb92a1ab3b parent: 1822:5a297ea605c7 parent: 1825:76efbe666d6c user: jrose date: Tue Jun 29 16:09:57 2010 -0700 summary: Merge changeset: 1827:726b40449bd2 parent: 1799:3a9de63b2209 user: zgu date: Tue Jun 22 09:46:15 2010 -0400 summary: 6939019: Source code adjustments for parfait compilation of hotspot changeset: 1828:3e351982aac7 parent: 1804:b9bc732be7c0 parent: 1827:726b40449bd2 user: zgu date: Tue Jun 22 10:03:12 2010 -0400 summary: Merge changeset: 1829:1a11430e0326 user: jcoomes date: Thu Jun 24 15:38:42 2010 -0700 summary: 6888573: class data sharing does not always disable large pages changeset: 1830:c5f1ea9e15e8 parent: 1829:1a11430e0326 parent: 1822:5a297ea605c7 user: coleenp date: Mon Jun 28 12:03:05 2010 -0400 summary: Merge changeset: 1831:a00567c82f02 parent: 1830:c5f1ea9e15e8 parent: 1826:fcbb92a1ab3b user: coleenp date: Wed Jun 30 11:52:10 2010 -0400 summary: Merge changeset: 1832:65b0c03b165d parent: 1826:fcbb92a1ab3b user: never date: Fri Jul 02 15:01:47 2010 -0700 summary: 6965671: fatal error: acquiring lock JNIGlobalHandle_lock/16 out of order with lock CodeCache_lock/1 changeset: 1833:60a14ad85270 user: kvn date: Fri Jul 02 17:30:30 2010 -0700 summary: 6966411: escape.cpp:450 assert(base->Opcode() == Op_ConP changeset: 1834:a693e51ac197 parent: 1831:a00567c82f02 parent: 1833:60a14ad85270 user: never date: Wed Jul 07 12:40:01 2010 -0700 summary: Merge changeset: 1835:b2a00dd3117c parent: 1831:a00567c82f02 user: jcoomes date: Thu Jul 01 21:40:45 2010 -0700 summary: 6957084: simplify TaskQueue overflow handling changeset: 1836:9ee05c8ab82f parent: 1835:b2a00dd3117c parent: 1834:a693e51ac197 user: ysr date: Mon Jul 12 12:53:52 2010 -0700 summary: Merge changeset: 1837:bfc89697cccb parent: 1830:c5f1ea9e15e8 user: acorn date: Fri Jul 02 17:23:43 2010 -0400 summary: 6964164: MonitorInUseLists leak of contended objects changeset: 1838:5087ecc10458 parent: 1837:bfc89697cccb parent: 1831:a00567c82f02 user: acorn date: Wed Jul 07 14:12:08 2010 -0400 summary: Merge changeset: 1839:0e7d2a08b605 user: mchung date: Wed Jul 07 15:35:58 2010 -0700 summary: 6967423: Hotspot support for modules image changeset: 1840:1e7ec26380bd parent: 1839:0e7d2a08b605 parent: 1836:9ee05c8ab82f user: apangin date: Wed Jul 14 17:52:18 2010 -0400 summary: Merge changeset: 1841:2a47bd84841f parent: 1834:a693e51ac197 user: never date: Thu Jul 08 14:29:44 2010 -0700 summary: 6965184: possible races in make_not_entrant_or_zombie changeset: 1842:3941674cc7fa user: never date: Mon Jul 12 10:58:25 2010 -0700 summary: 6958668: repeated uncommon trapping for new of klass which is being initialized changeset: 1843:8d5934a77f10 user: never date: Mon Jul 12 22:27:18 2010 -0700 summary: 6968385: malformed xml in sweeper logging changeset: 1844:079980c86f33 user: kvn date: Wed Jul 14 14:29:14 2010 -0700 summary: 6968646: JVM crashes with SIGFPE during startup changeset: 1845:8099e71601df user: kvn date: Wed Jul 14 14:47:34 2010 -0700 summary: 6968368: SIGSEGV in the BCEscapeAnalyzer::copy_dependencies changeset: 1846:a528509c992b user: never date: Thu Jul 15 08:54:48 2010 -0700 summary: 6968336: VM crash guarantee(!nm->is_zombie()) failed: cannot lock a zombie method changeset: 1847:61fdaf88f57f parent: 1840:1e7ec26380bd parent: 1846:a528509c992b user: never date: Thu Jul 15 13:48:01 2010 -0700 summary: Merge changeset: 1848:f56e28f22410 parent: 1792:e9ff18c4ace7 user: trims date: Thu Jun 03 18:18:56 2010 -0700 summary: 6958458: Bump the HS19 build number to 03 changeset: 1849:49242b3df6cd parent: 1774:573e8ea5fd68 user: mikejwre date: Thu Jun 03 13:30:08 2010 -0700 summary: Added tag jdk7-b96 for changeset 573e8ea5fd68 changeset: 1850:5f42499e57ad tag: jdk7-b97 user: trims date: Fri Jun 04 11:43:53 2010 -0700 summary: Added tag hs19-b02 for changeset 573e8ea5fd68 changeset: 1851:b0e7cd862748 user: mikejwre date: Thu Jun 10 13:58:59 2010 -0700 summary: Added tag jdk7-b97 for changeset 5f42499e57ad changeset: 1852:70191885f707 parent: 1850:5f42499e57ad user: prr date: Wed Jun 16 09:42:20 2010 -0700 summary: 6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers changeset: 1853:8a045b3f5c13 tag: jdk7-b98 parent: 1851:b0e7cd862748 parent: 1852:70191885f707 user: mikejwre date: Wed Jun 16 15:48:57 2010 -0700 summary: Merge changeset: 1854:695c43156a9a user: mikejwre date: Thu Jun 17 16:27:59 2010 -0700 summary: Added tag jdk7-b98 for changeset 8a045b3f5c13 changeset: 1855:c69846936352 parent: 1848:f56e28f22410 parent: 1854:695c43156a9a user: trims date: Thu Jun 17 23:59:24 2010 -0700 summary: Merge changeset: 1856:e848dd13e1b6 parent: 1855:c69846936352 parent: 1804:b9bc732be7c0 user: trims date: Fri Jun 18 00:09:22 2010 -0700 summary: Merge changeset: 1857:606df121c181 parent: 1848:f56e28f22410 parent: 1850:5f42499e57ad user: trims date: Fri Jun 04 11:54:35 2010 -0700 summary: Merge changeset: 1858:6a236384a379 tag: jdk7-b99 parent: 1856:e848dd13e1b6 parent: 1857:606df121c181 user: trims date: Fri Jun 18 00:19:10 2010 -0700 summary: Merge changeset: 1859:b34c75c0b6b8 user: mikejwre date: Thu Jun 24 20:03:00 2010 -0700 summary: Added tag jdk7-b99 for changeset 6a236384a379 changeset: 1860:e13a5c0ed5e2 parent: 1858:6a236384a379 user: prr date: Tue Jun 29 16:33:41 2010 -0700 summary: 6964882: 32 bit JDK does not build on 64 bit Windows platforms changeset: 1861:ad1977f08c4d tag: hs19-b03 tag: jdk7-b100 parent: 1859:b34c75c0b6b8 parent: 1860:e13a5c0ed5e2 user: mikejwre date: Wed Jun 30 18:57:35 2010 -0700 summary: Merge changeset: 1862:871d2aa321f7 parent: 1861:ad1977f08c4d parent: 1831:a00567c82f02 user: trims date: Fri Jul 02 01:36:15 2010 -0700 summary: Merge changeset: 1863:7cc68a696c62 user: trims date: Fri Jul 02 01:37:36 2010 -0700 summary: 6966252: Bump the HS19 build number to 04 changeset: 1864:56cc7e01da2f parent: 1861:ad1977f08c4d user: trims date: Fri Jul 09 00:31:01 2010 -0700 summary: Added tag hs19-b03 for changeset ad1977f08c4d changeset: 1865:1dbaff4aa23a parent: 1863:7cc68a696c62 parent: 1864:56cc7e01da2f user: trims date: Fri Jul 09 00:32:48 2010 -0700 summary: Merge changeset: 1866:cf647374e044 parent: 1865:1dbaff4aa23a parent: 1834:a693e51ac197 user: trims date: Fri Jul 09 00:35:35 2010 -0700 summary: Merge changeset: 1867:6c3a919105b6 tag: jdk7-b101 parent: 1861:ad1977f08c4d user: mikejwre date: Fri Jul 09 19:18:22 2010 -0700 summary: Added tag jdk7-b100 for changeset ad1977f08c4d changeset: 1868:a2b581345549 parent: 1866:cf647374e044 parent: 1867:6c3a919105b6 user: trims date: Thu Jul 15 19:51:34 2010 -0700 summary: Merge changeset: 1869:e55900b5c1b8 tag: hs19-b04 parent: 1868:a2b581345549 parent: 1847:61fdaf88f57f user: trims date: Thu Jul 15 19:52:58 2010 -0700 summary: Merge changeset: 1870:75b254ea860e parent: 1867:6c3a919105b6 user: mikejwre date: Thu Jul 15 20:11:35 2010 -0700 summary: Added tag jdk7-b101 for changeset 6c3a919105b6 changeset: 1871:c5cadf1a0771 tag: jdk7-b102 parent: 1869:e55900b5c1b8 parent: 1870:75b254ea860e user: trims date: Tue Jul 20 18:13:55 2010 -0700 summary: Merge changeset: 1872:e7ec8cd4dd8a parent: 1835:b2a00dd3117c user: tonyp date: Mon Jun 28 14:13:18 2010 -0400 summary: 6962569: assembler_sparc.cpp:1969: assert(false) failed: error changeset: 1873:4e5661ba9d98 user: tonyp date: Mon Jun 28 14:13:17 2010 -0400 summary: 6944166: G1: explicit GCs are not always handled correctly changeset: 1874:1a1ce2076047 parent: 1836:9ee05c8ab82f parent: 1873:4e5661ba9d98 user: ysr date: Fri Jul 16 10:09:15 2010 -0700 summary: Merge changeset: 1875:ad7e433e2730 parent: 1874:1a1ce2076047 parent: 1847:61fdaf88f57f user: ysr date: Tue Jul 20 16:09:44 2010 -0700 summary: Merge changeset: 1876:131ed9a23d48 parent: 1875:ad7e433e2730 parent: 1871:c5cadf1a0771 user: ysr date: Wed Jul 21 09:57:21 2010 -0700 summary: Merge changeset: 1877:083fde3b838e parent: 1846:a528509c992b user: jrose date: Thu Jul 15 18:40:45 2010 -0700 summary: 6964498: JSR 292 invokedynamic sites need local bootstrap methods changeset: 1878:01b172b8cd7c parent: 1847:61fdaf88f57f parent: 1877:083fde3b838e user: never date: Fri Jul 16 08:29:42 2010 -0700 summary: Merge changeset: 1879:e0ba4e04c839 user: jrose date: Fri Jul 16 18:14:19 2010 -0700 summary: 6969574: invokedynamic call sites deoptimize instead of executing changeset: 1880:7139e81efd2d user: never date: Thu Jul 22 15:29:22 2010 -0700 summary: 6970566: runThese fails with SIGSEGV changeset: 1881:5063ce716349 parent: 1876:131ed9a23d48 parent: 1880:7139e81efd2d user: never date: Fri Jul 23 10:21:17 2010 -0700 summary: Merge changeset: 1882:a93a9eda13f7 parent: 1874:1a1ce2076047 user: jcoomes date: Fri Jul 16 21:33:21 2010 -0700 summary: 6962947: shared TaskQueue statistics changeset: 1883:5cbac8938c4c user: johnc date: Mon Jul 19 11:06:34 2010 -0700 summary: 6956639: G1: assert(cached_ptr != card_ptr) failed: shouldn't be, concurrentG1Refine.cpp:307 changeset: 1884:4f1fffe08c63 parent: 1876:131ed9a23d48 parent: 1883:5cbac8938c4c user: ysr date: Wed Jul 21 12:45:42 2010 -0700 summary: Merge changeset: 1885:1890dc9151da parent: 1884:4f1fffe08c63 parent: 1881:5063ce716349 user: ysr date: Fri Jul 23 14:31:15 2010 -0700 summary: Merge changeset: 1886:a81afd9c293c parent: 1839:0e7d2a08b605 user: alanb date: Fri Jul 16 13:14:03 2010 +0100 summary: 6649594: Intermittent IOExceptions during dynamic attach on linux and solaris changeset: 1887:920aa833fd16 parent: 1847:61fdaf88f57f parent: 1886:a81afd9c293c user: apangin date: Sat Jul 17 21:49:23 2010 -0700 summary: Merge changeset: 1888:a5c9d63a187d user: apangin date: Tue Jul 20 08:41:42 2010 -0700 summary: 6964170: Verifier crashes changeset: 1889:7f0fdccac34f parent: 1888:a5c9d63a187d parent: 1885:1890dc9151da user: apangin date: Sun Jul 25 07:31:50 2010 -0700 summary: Merge changeset: 1890:3d90023429ec user: aph date: Wed Jul 28 17:38:21 2010 +0100 summary: 6888526: Linux getCurrentThreadCpuTime is drastically slower than Windows changeset: 1891:a64438a2b7e8 user: coleenp date: Wed Jul 28 17:57:43 2010 -0400 summary: 6958465: Sparc aten build24.0: openjdk-7.ea-b96 failed Error: Formal argument ... requires an lvalue changeset: 1892:126ea7725993 user: bobv date: Tue Aug 03 08:13:38 2010 -0400 summary: 6953477: Increase portability and flexibility of building Hotspot changeset: 1893:e5dfb3ccb88b parent: 1880:7139e81efd2d user: kvn date: Fri Jul 23 10:07:46 2010 -0700 summary: 6969569: assert(is_static() && is_constant()) failed: illegal call to constant_value() changeset: 1894:99ceb0e99c9e parent: 1885:1890dc9151da parent: 1893:e5dfb3ccb88b user: never date: Mon Jul 26 15:58:07 2010 -0700 summary: Merge changeset: 1895:66c5dadb4d61 user: kvn date: Fri Jul 30 10:21:15 2010 -0700 summary: 6973308: Missing zero length check before repne scas in check_klass_subtype_slow_path() changeset: 1896:0e35fa8ebccd user: kvn date: Tue Aug 03 15:55:03 2010 -0700 summary: 6973963: SEGV in ciBlock::start_bci() with EA changeset: 1897:0e09207fc81b user: kvn date: Wed Aug 04 17:42:20 2010 -0700 summary: 6974682: CTW: assert(target != NULL) failed: must not be null changeset: 1898:fb8abd207dbe user: kvn date: Fri Aug 06 11:53:28 2010 -0700 summary: 6975049: nsk/regression/b4287029 crashes with -Xss64 on solaris-i586 changeset: 1899:2dfd013a7465 user: kvn date: Mon Aug 09 15:17:05 2010 -0700 summary: 6975078: assert(allocated_on_res_area() || allocated_on_C_heap() || allocated_on_arena() changeset: 1900:f4f596978298 parent: 1892:126ea7725993 parent: 1899:2dfd013a7465 user: never date: Mon Aug 09 17:51:56 2010 -0700 summary: Merge changeset: 1901:36519c19beeb user: never date: Tue Aug 10 12:15:10 2010 -0700 summary: 6975027: use of movptr to set length of array changeset: 1902:4a665be40fd3 user: twisti date: Wed Aug 11 01:17:27 2010 -0700 summary: 6975855: don't emit deopt MH handler in C1 if not required changeset: 1903:d2ede61b7a12 user: twisti date: Wed Aug 11 05:51:21 2010 -0700 summary: 6976186: integrate Shark HotSpot changes changeset: 1904:6c9cc03d8726 user: kvn date: Wed Aug 11 10:48:20 2010 -0700 summary: 6973329: C2 with Zero based COOP produces code with broken anti-dependency on x86 changeset: 1905:ab3fd720516c parent: 1892:126ea7725993 user: rasbold date: Tue Aug 10 19:17:57 2010 -0400 summary: 6378314: Bad warning message when agent library not found. local directory is not searched. changeset: 1906:21e519b91576 parent: 1904:6c9cc03d8726 parent: 1905:ab3fd720516c user: dcubed date: Fri Aug 13 07:33:20 2010 -0700 summary: Merge changeset: 1907:f6f3eef8a521 parent: 1804:b9bc732be7c0 user: kevinw date: Fri Jul 30 22:43:50 2010 +0100 summary: 6581734: CMS Old Gen's collection usage is zero after GC which is incorrect changeset: 1908:63f4675ac87d parent: 1907:f6f3eef8a521 parent: 1885:1890dc9151da user: kevinw date: Sat Jul 31 15:10:59 2010 +0100 summary: Merge changeset: 1909:2d160770d2e5 user: johnc date: Mon Aug 02 12:51:43 2010 -0700 summary: 6814437: G1: remove the _new_refs array changeset: 1910:9d7a8ab3736b user: tonyp date: Thu Jul 22 10:27:41 2010 -0400 summary: 6962589: remove breadth first scanning code from parallel gc changeset: 1911:0ce1569c90e5 user: tonyp date: Wed Aug 04 13:03:23 2010 -0400 summary: 6963209: G1: remove the concept of abandoned pauses changeset: 1912:a03ae377b2e8 user: johnc date: Fri Aug 06 10:17:21 2010 -0700 summary: 6930581: G1: assert(ParallelGCThreads > 1 || n_yielded() == _hrrs->occupied(),"Should have yielded all the .. changeset: 1913:5f429ee79634 user: jcoomes date: Mon Aug 09 05:41:05 2010 -0700 summary: 6966222: G1: simplify TaskQueue overflow handling changeset: 1914:94251661de76 user: jcoomes date: Mon Aug 09 18:03:50 2010 -0700 summary: 6970376: ParNew: shared TaskQueue statistics changeset: 1915:a6bff45449bc user: ysr date: Tue Aug 10 14:53:35 2010 -0700 summary: 6973570: OrderAccess::storestore() scales poorly on multi-socket x64 and sparc: cache-line ping-ponging changeset: 1916:2d6b74c9a797 user: jcoomes date: Wed Aug 11 13:12:28 2010 -0700 summary: 6976378: ParNew: stats are printed unconditionally in debug builds changeset: 1917:7fcd5f39bd7a parent: 1906:21e519b91576 parent: 1916:2d6b74c9a797 user: johnc date: Sat Aug 14 00:47:52 2010 -0700 summary: Merge changeset: 1918:cb4250ef73b2 tag: jdk7-b103 parent: 1871:c5cadf1a0771 user: mikejwre date: Fri Jul 23 16:42:15 2010 -0700 summary: Added tag jdk7-b102 for changeset c5cadf1a0771 changeset: 1919:efd4401fab1d user: cl date: Thu Jul 29 13:33:08 2010 -0700 summary: Added tag jdk7-b103 for changeset cb4250ef73b2 changeset: 1920:cc3fdfeb54b0 tag: hs19-b05 parent: 1918:cb4250ef73b2 parent: 1885:1890dc9151da user: trims date: Thu Jul 29 23:14:56 2010 -0700 summary: Merge changeset: 1921:fd2645290e89 user: trims date: Fri Jul 30 06:56:40 2010 -0700 summary: 6973381: Bump the HS19 build number to 05 changeset: 1922:28abe3f6a5f6 parent: 1921:fd2645290e89 parent: 1919:efd4401fab1d user: trims date: Tue Aug 03 19:01:25 2010 -0700 summary: Merge changeset: 1923:b4acf10eb134 tag: jdk7-b104 user: trims date: Thu Aug 05 02:48:45 2010 -0700 summary: Added tag hs19-b04 for changeset e55900b5c1b8 changeset: 1924:6709c14587c2 tag: jdk7-b105 user: cl date: Fri Aug 06 12:51:54 2010 -0700 summary: Added tag jdk7-b104 for changeset b4acf10eb134 changeset: 1925:3dc64719cf18 user: cl date: Fri Aug 13 11:38:16 2010 -0700 summary: Added tag jdk7-b105 for changeset 6709c14587c2 changeset: 1926:688a538aa654 parent: 1924:6709c14587c2 parent: 1906:21e519b91576 user: trims date: Fri Aug 13 10:55:42 2010 -0700 summary: Merge changeset: 1927:5f3c8db59d83 user: trims date: Fri Aug 13 10:56:17 2010 -0700 summary: 6977051: Bump the HS19 build number to 06 changeset: 1928:1b81ca701fa5 tag: jdk7-b106 parent: 1927:5f3c8db59d83 parent: 1925:3dc64719cf18 user: trims date: Tue Aug 17 09:43:34 2010 -0700 summary: Merge changeset: 1929:f121b2772674 parent: 1928:1b81ca701fa5 parent: 1917:7fcd5f39bd7a user: trims date: Wed Aug 18 16:11:21 2010 -0700 summary: Merge changeset: 1930:495caa35b1b5 user: asaha date: Tue Aug 17 22:52:50 2010 -0700 summary: 6977952: Test: Sync missing tests from hs16.3 to hs17.x changeset: 1931:be3f9c242c9d parent: 1917:7fcd5f39bd7a user: ysr date: Mon Aug 16 15:58:42 2010 -0700 summary: 6948538: CMS: BOT walkers can fall into object allocation and initialization cracks changeset: 1932:688c3755d7af user: tonyp date: Tue Aug 17 14:40:00 2010 -0400 summary: 6959014: G1: assert(minimum_desired_capacity <= maximum_desired_capacity) failed: sanity check changeset: 1933:bb847e31b836 user: tonyp date: Tue Aug 17 14:40:00 2010 -0400 summary: 6974928: G1: sometimes humongous objects are allocated in young regions changeset: 1934:b63010841f78 user: tonyp date: Tue Aug 17 14:40:00 2010 -0400 summary: 6975964: G1: print out a more descriptive message for evacuation failure when +PrintGCDetails is set changeset: 1935:5ed703250bff user: ysr date: Wed Aug 18 11:39:21 2010 -0700 summary: 6977970: CMS: concurrentMarkSweepGeneration.cpp:7947 assert(addr <= _limit) failed: sweep invariant changeset: 1936:413ad0331a0c parent: 1934:b63010841f78 user: johnc date: Wed Aug 18 10:59:06 2010 -0700 summary: 6977924: Changes for 6975078 produce build error with certain gcc versions changeset: 1937:effb55808a18 parent: 1936:413ad0331a0c parent: 1935:5ed703250bff user: johnc date: Wed Aug 18 17:44:33 2010 -0400 summary: Merge changeset: 1938:1b0104ab1e5e parent: 1930:495caa35b1b5 parent: 1937:effb55808a18 user: tonyp date: Thu Aug 19 14:08:58 2010 -0400 summary: Merge changeset: 1939:30266066c77c parent: 1928:1b81ca701fa5 user: cl date: Thu Aug 19 15:13:01 2010 -0700 summary: Added tag jdk7-b106 for changeset 1b81ca701fa5 changeset: 1940:295c3ae4ab5b user: trims date: Thu Aug 19 18:51:24 2010 -0700 summary: Added tag hs19-b05 for changeset cc3fdfeb54b0 changeset: 1941:bf496cbe9b74 tag: jdk7-b107 user: trims date: Thu Aug 19 18:51:34 2010 -0700 summary: Added tag hs19-b06 for changeset 688a538aa654 changeset: 1942:0e509ddd9962 user: trims date: Fri Aug 20 03:47:09 2010 -0700 summary: 6978726: Bump the HS19 build number to 07 changeset: 1943:09cdb1e1c77b parent: 1942:0e509ddd9962 parent: 1938:1b0104ab1e5e user: trims date: Fri Aug 20 04:08:08 2010 -0700 summary: Merge changeset: 1944:71faaa8e3ccc parent: 1904:6c9cc03d8726 user: never date: Thu Aug 12 16:38:23 2010 -0700 summary: 6974176: ShouldNotReachHere, instanceKlass.cpp:1426 changeset: 1945:da877bdc9000 user: never date: Thu Aug 12 23:34:34 2010 -0700 summary: 6975006: assert(check.is_deoptimized_frame()) failed: missed deopt changeset: 1946:a62d332029cf user: never date: Fri Aug 13 15:14:00 2010 -0700 summary: 6976372: # assert(_owner == Thread::current()) failed: invariant changeset: 1947:13b87063b4d8 user: twisti date: Wed Aug 18 01:22:16 2010 -0700 summary: 6977640: Zero and Shark fixes changeset: 1948:f55c4f82ab9d user: never date: Thu Aug 19 14:51:47 2010 -0700 summary: 6978249: spill between cpu and fpu registers when those moves are fast changeset: 1949:ee5cc9e78493 parent: 1943:09cdb1e1c77b parent: 1948:f55c4f82ab9d user: never date: Fri Aug 20 09:55:50 2010 -0700 summary: Merge changeset: 1950:52f2bc645da5 parent: 1937:effb55808a18 user: ysr date: Thu Aug 19 12:02:10 2010 -0700 summary: 6978533: CMS: Elide BOT update asserts until 6977974 is fixed correctly changeset: 1951:66b9f90a9211 parent: 1943:09cdb1e1c77b parent: 1950:52f2bc645da5 user: tonyp date: Fri Aug 20 13:17:08 2010 -0400 summary: Merge changeset: 1952:26faca352942 parent: 1951:66b9f90a9211 parent: 1949:ee5cc9e78493 user: tonyp date: Fri Aug 20 12:01:10 2010 -0700 summary: Merge changeset: 1953:571f6b35140b user: trims date: Fri Aug 20 12:57:42 2010 -0700 summary: 6978889: Remove premature change of build number to Hotspot 19 Build 07 changeset: 1954:b0b9d64ed9bc user: trims date: Fri Aug 20 14:24:47 2010 -0700 summary: 6978915: Remove Mercurial tags for Hotspot 19 Build 06 changeset: 1955:e44a93947ccb parent: 1941:bf496cbe9b74 user: cl date: Thu Aug 26 16:16:49 2010 -0700 summary: Added tag jdk7-b107 for changeset bf496cbe9b74 changeset: 1956:6c43216df135 tag: hs19-b06 parent: 1954:b0b9d64ed9bc parent: 1955:e44a93947ccb user: trims date: Tue Aug 31 16:48:07 2010 -0700 summary: Merge changeset: 1957:0803c0f69b51 user: trims date: Tue Aug 31 17:23:45 2010 -0700 summary: Added tag hs19-b06 for changeset 6c43216df135 changeset: 1958:b69c41ea1764 tag: tip parent: 1586:b23b4c2c0d44 parent: 1957:0803c0f69b51 user: andrew date: Tue Sep 21 14:30:37 2010 +0100 summary: Merge > -Joe > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Tue Oct 12 14:53:18 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 12 Oct 2010 14:53:18 -0700 Subject: hs19 import In-Reply-To: <20101012123723.GD6208@rivendell.middle-earth.co.uk> References: <20100915201407.GE673@rivendell.middle-earth.co.uk> <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> <20101008140837.GB1907@rivendell.middle-earth.co.uk> <4CAF6E74.3010306@oracle.com> <20101012123723.GD6208@rivendell.middle-earth.co.uk> Message-ID: <4CB4D8CE.9060105@oracle.com> Dr Andrew John Hughes wrote: > On 12:18 Fri 08 Oct , Joe Darcy wrote: > >> Dr Andrew John Hughes wrote: >> >>> On 09:46 Thu 23 Sep , Joe Darcy wrote: >>> >>> >>>> Dr Andrew John Hughes wrote: >>>> >>>> >>>>> On 08:51 Tue 21 Sep , Joe Darcy wrote: >>>>> >>>>> >>>>> >>>>>> Erik Trimble wrote: >>>>>> >>>>>> >>>>>> >>>>>>> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>>> On 21:37 Wed 15 Sep , Erik Trimble wrote: >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>>>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>>> I notice that new repositories have appeared for a hs19 stable branch: >>>>>>>>>> >>>>>>>>>> http://hg.openjdk.java.net/hsx/hsx19/master/ >>>>>>>>>> >>>>>>>>>> Shall we start looking at this with regards to importing it for b21? >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> >>>>>>>>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now >>>>>>>>> starting with Hotspot 20). >>>>>>>>> >>>>>>>>> I would consider the hsx19 repos to be stable. There *may* be >>>>>>>>> additional >>>>>>>>> development in them, but if so (and I'm not specifically promising >>>>>>>>> anything), such development will be stabilization only. New feature >>>>>>>>> development is now in HS20 over in the main JDK7 repos. >>>>>>>>> >>>>>>>>> HS19 is now in stabilization (bugfix-only) stage, and is suitable for >>>>>>>>> work to begin on importing into OpenJDK 6. >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>>> >>>>>>>> Thanks for the quick reply, Erik. >>>>>>>> >>>>>>>> I've started work on the merge, which is taking a while because of >>>>>>>> the orthogonal >>>>>>>> copyright header changes in OpenJDK6 and HotSpot :-( >>>>>>>> >>>>>>>> One thing I have noticed is that some headers in hs19 don't have a >>>>>>>> trailing comma before 'Oracle' >>>>>>>> and this is also true of the header template: >>>>>>>> >>>>>>>> --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 >>>>>>>> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 >>>>>>>> 13:01:36.601792981 +0100 >>>>>>>> @@ -1,4 +1,4 @@ >>>>>>>> -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. >>>>>>>> +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. >>>>>>>> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. >>>>>>>> >>>>>>>> Is HotSpot 19 correct or OpenJDK6? >>>>>>>> >>>>>>>> >>>>>>>> >>>>>>> I think it's both. :-) >>>>>>> >>>>>>> >>>>>>> That is, the correct format for an explicitly stated copyright should be >>>>>>> >>>>>>> >>>>>>> Copyright 2000, Oracle and/or .... >>>>>>> >>>>>>> AND >>>>>>> >>>>>>> Copyright 2000, 2003, Oracle and/or ... >>>>>>> >>>>>>> >>>>>>> There should be a comma after each date (the second instance implies a >>>>>>> date range between the two years). >>>>>>> >>>>>>> For the %YEARS% substitution in the templates, I don't think it >>>>>>> matters whether there is a comma. It won't be right after a >>>>>>> substitution no matter what we do. :-) >>>>>>> >>>>>>> >>>>>>> If you find instances of the the first case where there isn't a proper >>>>>>> comma inserted, PLEASE let me know. I need to fix it. >>>>>>> >>>>>>> >>>>>>> >>>>>>> >>>>>> Erik, >>>>>> >>>>>> Back during the big rebranding push, the GPL templates got updated a few >>>>>> times: >>>>>> >>>>>> 6943119: Rebrand source copyright notices >>>>>> 6961870: More rebranding fixes for templates/gpl-*-header files >>>>>> >>>>>> At the time, I didn't update the templates in the HotSpot repo in an >>>>>> attempt to avoid future merge issues. However, the templates in HS >>>>>> should match the templates in the jdk and root repository which now read as >>>>>> >>>>>> Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. >>>>>> >>>>>> -Joe >>>>>> >>>>>> >>>>>> >>>>>> >>>>> This webrev (against the current hotspot-rt tree) fixes the copyright issues, >>>>> including the template files Joe mentions and the missing trailing commas as well as >>>>> providing some copyright year updates present in OpenJDK6 but not HotSpot. >>>>> >>>>> http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ >>>>> >>>>> Erik, feel free to assign this a bug ID and push it through JPRT if it helps. >>>>> >>>>> Joe, a webrev for the OpenJDK6 hs19 merge is at: >>>>> >>>>> http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ >>>>> >>>>> Please let me know if I can push this. >>>>> >>>>> Thanks, >>>>> >>>>> >>>>> >>>> Hi Andrew. >>>> >>>> I won't get a chance to look at this until after JavaOne. >>>> >>>> Thanks, >>>> >>>> -Joe >>>> >>>> >>> Hi Joe, >>> >>> Any progress on this? >>> >>> >> Hello. >> >> Sorry of the delay. >> > > Sorry, missed this mail for some reason. > > >> I'm a bit confused with the contents of >> >> http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ >> >> Why are the Sun -> Oracle copyright changes present here since both HS19 >> and OpenJDK 6 HS repos have already had the rebranding done? >> >> The copyright changes look correct to me. >> >> > > I don't think that webrevs are the clearest thing for these merges. > Suggestions welcome :-) > > Indeed, hs19 does have the copyright changes. And so they are part of > the series of changesets between the tip of the hs19 master repository > and what was in OpenJDK6 previously (hs17). So the rebranding was > applied again to the OpenJDK6 repository, causing lots of lovely > conflicts due to orthogonal copyright changes. This is what allowed > me to catch the discrepancies between the two runs I mentioned to > Erik. > > What you're seeing in the webrev is the HotSpot copyright update. > > changeset: 1772:c18cbe5936b8 > user: trims > date: Thu May 27 19:08:38 2010 -0700 > summary: 6941466: Oracle rebranding changes for Hotspot repositories > > This is then merged into OpenJDK6 in the merge changeset. > > [snip] Understood. Your current hs19 merge is approved to go back into OpenJDK 6 b21. Note that you may have noticed some more recent bug fixing activity going on in hs19. In principle those changes can go back too, but I'd prefer they be done after the current work is merged in. Thanks, -Joe From gbenson at redhat.com Wed Oct 13 02:39:20 2010 From: gbenson at redhat.com (Gary Benson) Date: Wed, 13 Oct 2010 10:39:20 +0100 Subject: Request to backport 6976186: Shark build system changes Message-ID: <20101013093920.GA3362@redhat.com> Hi all, hs19 contains Shark, but the jdk6 build system is missing two changesets outside of HotSpot that enable it in the build: http://hg.openjdk.java.net/jdk7/jdk7/rev/1fbed32d2ddd http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/0cdd73548292 I've made a webrev of the two, as applied to jdk6: http://cr.openjdk.java.net/~gbenson/jdk6-shark-build/ With this webrev, building jdk6 with Shark can be as simple as adding SHARK_BUILD=true to your environment. Would it be ok to commit this? Cheers, Gary -- http://gbenson.net/ From ahughes at redhat.com Wed Oct 13 05:27:12 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 13 Oct 2010 13:27:12 +0100 Subject: hs19 import In-Reply-To: <4CB4D8CE.9060105@oracle.com> References: <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> <20101008140837.GB1907@rivendell.middle-earth.co.uk> <4CAF6E74.3010306@oracle.com> <20101012123723.GD6208@rivendell.middle-earth.co.uk> <4CB4D8CE.9060105@oracle.com> Message-ID: <20101013122712.GA24733@rivendell.middle-earth.co.uk> On 14:53 Tue 12 Oct , Joe Darcy wrote: > Dr Andrew John Hughes wrote: > > On 12:18 Fri 08 Oct , Joe Darcy wrote: > > > >> Dr Andrew John Hughes wrote: > >> > >>> On 09:46 Thu 23 Sep , Joe Darcy wrote: > >>> > >>> > >>>> Dr Andrew John Hughes wrote: > >>>> > >>>> > >>>>> On 08:51 Tue 21 Sep , Joe Darcy wrote: > >>>>> > >>>>> > >>>>> > >>>>>> Erik Trimble wrote: > >>>>>> > >>>>>> > >>>>>> > >>>>>>> On 9/20/2010 11:39 AM, Dr Andrew John Hughes wrote: > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>>> On 21:37 Wed 15 Sep , Erik Trimble wrote: > >>>>>>>> > >>>>>>>> > >>>>>>>> > >>>>>>>>> On 9/15/2010 1:14 PM, Dr Andrew John Hughes wrote: > >>>>>>>>> > >>>>>>>>> > >>>>>>>>> > >>>>>>>>>> I notice that new repositories have appeared for a hs19 stable branch: > >>>>>>>>>> > >>>>>>>>>> http://hg.openjdk.java.net/hsx/hsx19/master/ > >>>>>>>>>> > >>>>>>>>>> Shall we start looking at this with regards to importing it for b21? > >>>>>>>>>> > >>>>>>>>>> > >>>>>>>>>> > >>>>>>>>> Go ahead. We've officially forked HS19 now (the JDK7 repos are now > >>>>>>>>> starting with Hotspot 20). > >>>>>>>>> > >>>>>>>>> I would consider the hsx19 repos to be stable. There *may* be > >>>>>>>>> additional > >>>>>>>>> development in them, but if so (and I'm not specifically promising > >>>>>>>>> anything), such development will be stabilization only. New feature > >>>>>>>>> development is now in HS20 over in the main JDK7 repos. > >>>>>>>>> > >>>>>>>>> HS19 is now in stabilization (bugfix-only) stage, and is suitable for > >>>>>>>>> work to begin on importing into OpenJDK 6. > >>>>>>>>> > >>>>>>>>> > >>>>>>>>> > >>>>>>>>> > >>>>>>>> Thanks for the quick reply, Erik. > >>>>>>>> > >>>>>>>> I've started work on the merge, which is taking a while because of > >>>>>>>> the orthogonal > >>>>>>>> copyright header changes in OpenJDK6 and HotSpot :-( > >>>>>>>> > >>>>>>>> One thing I have noticed is that some headers in hs19 don't have a > >>>>>>>> trailing comma before 'Oracle' > >>>>>>>> and this is also true of the header template: > >>>>>>>> > >>>>>>>> --- make/templates/gpl-cp-header 2010-09-20 19:34:32.605298269 +0100 > >>>>>>>> +++ ../../hs19/make/templates/gpl-cp-header 2010-09-16 > >>>>>>>> 13:01:36.601792981 +0100 > >>>>>>>> @@ -1,4 +1,4 @@ > >>>>>>>> -Copyright %YEARS%, Oracle and/or its affiliates. All rights reserved. > >>>>>>>> +Copyright %YEARS% Oracle and/or its affiliates. All rights reserved. > >>>>>>>> DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. > >>>>>>>> > >>>>>>>> Is HotSpot 19 correct or OpenJDK6? > >>>>>>>> > >>>>>>>> > >>>>>>>> > >>>>>>> I think it's both. :-) > >>>>>>> > >>>>>>> > >>>>>>> That is, the correct format for an explicitly stated copyright should be > >>>>>>> > >>>>>>> > >>>>>>> Copyright 2000, Oracle and/or .... > >>>>>>> > >>>>>>> AND > >>>>>>> > >>>>>>> Copyright 2000, 2003, Oracle and/or ... > >>>>>>> > >>>>>>> > >>>>>>> There should be a comma after each date (the second instance implies a > >>>>>>> date range between the two years). > >>>>>>> > >>>>>>> For the %YEARS% substitution in the templates, I don't think it > >>>>>>> matters whether there is a comma. It won't be right after a > >>>>>>> substitution no matter what we do. :-) > >>>>>>> > >>>>>>> > >>>>>>> If you find instances of the the first case where there isn't a proper > >>>>>>> comma inserted, PLEASE let me know. I need to fix it. > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>> Erik, > >>>>>> > >>>>>> Back during the big rebranding push, the GPL templates got updated a few > >>>>>> times: > >>>>>> > >>>>>> 6943119: Rebrand source copyright notices > >>>>>> 6961870: More rebranding fixes for templates/gpl-*-header files > >>>>>> > >>>>>> At the time, I didn't update the templates in the HotSpot repo in an > >>>>>> attempt to avoid future merge issues. However, the templates in HS > >>>>>> should match the templates in the jdk and root repository which now read as > >>>>>> > >>>>>> Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved. > >>>>>> > >>>>>> -Joe > >>>>>> > >>>>>> > >>>>>> > >>>>>> > >>>>> This webrev (against the current hotspot-rt tree) fixes the copyright issues, > >>>>> including the template files Joe mentions and the missing trailing commas as well as > >>>>> providing some copyright year updates present in OpenJDK6 but not HotSpot. > >>>>> > >>>>> http://cr.openjdk.java.net/~andrew/copyright/webrev.01/ > >>>>> > >>>>> Erik, feel free to assign this a bug ID and push it through JPRT if it helps. > >>>>> > >>>>> Joe, a webrev for the OpenJDK6 hs19 merge is at: > >>>>> > >>>>> http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ > >>>>> > >>>>> Please let me know if I can push this. > >>>>> > >>>>> Thanks, > >>>>> > >>>>> > >>>>> > >>>> Hi Andrew. > >>>> > >>>> I won't get a chance to look at this until after JavaOne. > >>>> > >>>> Thanks, > >>>> > >>>> -Joe > >>>> > >>>> > >>> Hi Joe, > >>> > >>> Any progress on this? > >>> > >>> > >> Hello. > >> > >> Sorry of the delay. > >> > > > > Sorry, missed this mail for some reason. > > > > > >> I'm a bit confused with the contents of > >> > >> http://cr.openjdk.java.net/~andrew/jdk6-hs19-merge/webrev.01/ > >> > >> Why are the Sun -> Oracle copyright changes present here since both HS19 > >> and OpenJDK 6 HS repos have already had the rebranding done? > >> > >> The copyright changes look correct to me. > >> > >> > > > > I don't think that webrevs are the clearest thing for these merges. > > Suggestions welcome :-) > > > > Indeed, hs19 does have the copyright changes. And so they are part of > > the series of changesets between the tip of the hs19 master repository > > and what was in OpenJDK6 previously (hs17). So the rebranding was > > applied again to the OpenJDK6 repository, causing lots of lovely > > conflicts due to orthogonal copyright changes. This is what allowed > > me to catch the discrepancies between the two runs I mentioned to > > Erik. > > > > What you're seeing in the webrev is the HotSpot copyright update. > > > > changeset: 1772:c18cbe5936b8 > > user: trims > > date: Thu May 27 19:08:38 2010 -0700 > > summary: 6941466: Oracle rebranding changes for Hotspot repositories > > > > This is then merged into OpenJDK6 in the merge changeset. > > > > > > [snip] > > Understood. > > Your current hs19 merge is approved to go back into OpenJDK 6 b21. > Thanks. Done. > Note that you may have noticed some more recent bug fixing activity > going on in hs19. In principle those changes can go back too, but I'd > prefer they be done after the current work is merged in. > I don't see anything new: $ hg in http://hg.openjdk.java.net/hsx/hsx19/master comparing with http://hg.openjdk.java.net/hsx/hsx19/master searching for changes no changes found > Thanks, > > -Joe -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From dalibor.topic at oracle.com Wed Oct 13 05:36:02 2010 From: dalibor.topic at oracle.com (Dalibor Topic) Date: Wed, 13 Oct 2010 14:36:02 +0200 Subject: hs19 import In-Reply-To: <20101013122712.GA24733@rivendell.middle-earth.co.uk> References: <4C919F27.6090607@oracle.com> <20100920183906.GM16943@rivendell.middle-earth.co.uk> <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> <20101008140837.GB1907@rivendell.middle-earth.co.uk> <4CAF6E74.3010306@oracle.com> <20101012123723.GD6208@rivendell.middle-earth.co.uk> <4CB4D8CE.9060105@oracle.com> <20101013122712.GA24733@rivendell.middle-earth.co.uk> Message-ID: <4CB5A7B2.8000806@oracle.com> On 10/13/10 2:27 PM, Dr Andrew John Hughes wrote: > I don't see anything new: > > $ hg in http://hg.openjdk.java.net/hsx/hsx19/master > comparing with http://hg.openjdk.java.net/hsx/hsx19/master > searching for changes > no changes found I think they went into baseline rather then master. :/ cheers, dalibor topic -- Oracle Dalibor Topic | Java F/OSS Ambassador Phone: +494023646738 | | | Mobile: +491772664192 Oracle Java Platform Group 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 Green Oracle Oracle is committed to developing practices and products that help protect the environment From joe.darcy at oracle.com Wed Oct 13 08:32:56 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 13 Oct 2010 08:32:56 -0700 Subject: Request to backport 6976186: Shark build system changes In-Reply-To: <20101013093920.GA3362@redhat.com> References: <20101013093920.GA3362@redhat.com> Message-ID: <4CB5D128.3030001@oracle.com> Gary Benson wrote: > Hi all, > > hs19 contains Shark, but the jdk6 build system is missing two > changesets outside of HotSpot that enable it in the build: > > http://hg.openjdk.java.net/jdk7/jdk7/rev/1fbed32d2ddd > http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/0cdd73548292 > > I've made a webrev of the two, as applied to jdk6: > > http://cr.openjdk.java.net/~gbenson/jdk6-shark-build/ > > With this webrev, building jdk6 with Shark can be as simple as > adding SHARK_BUILD=true to your environment. > > Would it be ok to commit this? > > Yes, approved to be backported. Thanks, -Joe From gbenson at redhat.com Wed Oct 13 08:56:18 2010 From: gbenson at redhat.com (gbenson at redhat.com) Date: Wed, 13 Oct 2010 15:56:18 +0000 Subject: hg: jdk6/jdk6/jdk: 6976186: Shark build system changes Message-ID: <20101013155626.18FEB470F1@hg.openjdk.java.net> Changeset: d5c1a46c3dad Author: gbenson Date: 2010-10-13 16:56 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/d5c1a46c3dad 6976186: Shark build system changes Summary: Add Shark-specific variables to make/jdk_generic_profile.sh Reviewed-by: darcy ! make/jdk_generic_profile.sh From gbenson at redhat.com Wed Oct 13 08:58:46 2010 From: gbenson at redhat.com (gbenson at redhat.com) Date: Wed, 13 Oct 2010 15:58:46 +0000 Subject: hg: jdk6/jdk6: 6976186: Shark build system changes Message-ID: <20101013155846.4C38A470F3@hg.openjdk.java.net> Changeset: 5f31d69209e5 Author: gbenson Date: 2010-10-13 16:58 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/rev/5f31d69209e5 6976186: Shark build system changes Summary: Switch to Shark target when SHARK_BUILD is true Reviewed-by: darcy ! make/hotspot-rules.gmk From gbenson at redhat.com Wed Oct 13 08:59:35 2010 From: gbenson at redhat.com (Gary Benson) Date: Wed, 13 Oct 2010 16:59:35 +0100 Subject: Request to backport 6976186: Shark build system changes In-Reply-To: <4CB5D128.3030001@oracle.com> References: <20101013093920.GA3362@redhat.com> <4CB5D128.3030001@oracle.com> Message-ID: <20101013155934.GF3362@redhat.com> Joe Darcy wrote: > Gary Benson wrote: > > hs19 contains Shark, but the jdk6 build system is missing two > > changesets outside of HotSpot that enable it in the build: > > > > http://hg.openjdk.java.net/jdk7/jdk7/rev/1fbed32d2ddd > > http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/0cdd73548292 > > > > I've made a webrev of the two, as applied to jdk6: > > > > http://cr.openjdk.java.net/~gbenson/jdk6-shark-build/ > > > > With this webrev, building jdk6 with Shark can be as simple as > > adding SHARK_BUILD=true to your environment. > > > > Would it be ok to commit this? > > Yes, approved to be backported. Thanks Joe, pushed. Cheers, Gary -- http://gbenson.net/ From ahughes at redhat.com Wed Oct 13 09:58:52 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 13 Oct 2010 17:58:52 +0100 Subject: hs19 import In-Reply-To: <4CB5A7B2.8000806@oracle.com> References: <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> <20101008140837.GB1907@rivendell.middle-earth.co.uk> <4CAF6E74.3010306@oracle.com> <20101012123723.GD6208@rivendell.middle-earth.co.uk> <4CB4D8CE.9060105@oracle.com> <20101013122712.GA24733@rivendell.middle-earth.co.uk> <4CB5A7B2.8000806@oracle.com> Message-ID: <20101013165852.GH24733@rivendell.middle-earth.co.uk> On 14:36 Wed 13 Oct , Dalibor Topic wrote: > On 10/13/10 2:27 PM, Dr Andrew John Hughes wrote: > > > I don't see anything new: > > > > $ hg in http://hg.openjdk.java.net/hsx/hsx19/master > > comparing with http://hg.openjdk.java.net/hsx/hsx19/master > > searching for changes > > no changes found > > I think they went into baseline rather then master. :/ > Then, AIUI, we don't want them yet; we wait until they are promoted. > cheers, > dalibor topic > > -- > Oracle > Dalibor Topic | Java F/OSS Ambassador > Phone: +494023646738 | | | Mobile: +491772664192 > Oracle Java Platform Group > > 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 > > Green Oracle Oracle is committed to developing practices and products that help protect the environment -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From erik.trimble at oracle.com Wed Oct 13 10:50:44 2010 From: erik.trimble at oracle.com (Erik Trimble) Date: Wed, 13 Oct 2010 10:50:44 -0700 Subject: hs19 import In-Reply-To: <20101013165852.GH24733@rivendell.middle-earth.co.uk> References: <4C982CD6.2050405@oracle.com> <4C98D489.4080009@oracle.com> <20100921224624.GA9599@rivendell.middle-earth.co.uk> <4C9B8466.8040304@oracle.com> <20101008140837.GB1907@rivendell.middle-earth.co.uk> <4CAF6E74.3010306@oracle.com> <20101012123723.GD6208@rivendell.middle-earth.co.uk> <4CB4D8CE.9060105@oracle.com> <20101013122712.GA24733@rivendell.middle-earth.co.uk> <4CB5A7B2.8000806@oracle.com> <20101013165852.GH24733@rivendell.middle-earth.co.uk> Message-ID: <4CB5F174.6030405@oracle.com> On 10/13/2010 9:58 AM, Dr Andrew John Hughes wrote: > On 14:36 Wed 13 Oct , Dalibor Topic wrote: >> On 10/13/10 2:27 PM, Dr Andrew John Hughes wrote: >> >>> I don't see anything new: >>> >>> $ hg in http://hg.openjdk.java.net/hsx/hsx19/master >>> comparing with http://hg.openjdk.java.net/hsx/hsx19/master >>> searching for changes >>> no changes found >> I think they went into baseline rather then master. :/ >> > Then, AIUI, we don't want them yet; we wait until they are promoted. > >> cheers, >> dalibor topic >> >> -- >> Oracle >> Dalibor Topic | Java F/OSS Ambassador >> Phone: +494023646738 | | | Mobile: +491772664192 >> Oracle Java Platform Group >> >> 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 >> >> Green Oracle Oracle is committed to developing practices and products that help protect the environment They should be promoted shortly - I just finished testing, and everything went fine,but SQE's testing tool isn't producing the proper test certification (that big thing that lists all the CRs and status) properly. I'm waiting to get that fixed and have a cert in-hand before I promote baseline to master. -- Erik Trimble Java System Support Mailstop: usca22-123 Phone: x17195 Santa Clara, CA From joe.darcy at oracle.com Thu Oct 14 18:04:02 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Thu, 14 Oct 2010 18:04:02 -0700 Subject: About time for b21? Message-ID: <4CB7A882.3080008@oracle.com> Hello. With Andrew's sync of HS19 into OpenJDK 6 and the recent batch of security fixes coming real soon now, I think it is about time to have b21. I'd hold b21 for the remaining bug fixes pushed to HS19 that are not quite promoted yet. Are there any other changes that should be in b21? -Joe From ahughes at redhat.com Mon Oct 18 07:28:12 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 18 Oct 2010 15:28:12 +0100 Subject: About time for b21? In-Reply-To: <4CB7A882.3080008@oracle.com> References: <4CB7A882.3080008@oracle.com> Message-ID: <20101018142812.GC31704@rivendell.middle-earth.co.uk> On 18:04 Thu 14 Oct , Joe Darcy wrote: > Hello. > > With Andrew's sync of HS19 into OpenJDK 6 and the recent batch of > security fixes coming real soon now, I think it is about time to have > b21. I'd hold b21 for the remaining bug fixes pushed to HS19 that are > not quite promoted yet. > > Are there any other changes that should be in b21? > > -Joe http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-September/002008.html is still awaiting review. Two of the three suggestions on http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-August/001954.html are also still pending (haven't had time to follow them up). 6678385 did go in, so 6853592 could do with also going in. See: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-October/010509.html 6853592: VM test nsk.regression.b4261880 fails with "X Error of failed request: BadWindow" inconsistently. I'll post webrevs for these three if they sound ok for OpenJDK6 b21. I was going to look at pushing the XRender/DirectX backport upstream, but I think that could do with more soak time in IcedTea6. We'll do that in b22. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From abhi.saha at oracle.com Mon Oct 18 15:33:20 2010 From: abhi.saha at oracle.com (abhi.saha at oracle.com) Date: Mon, 18 Oct 2010 22:33:20 +0000 Subject: hg: jdk6/jdk6/corba: 6891766: Vulnerabilities in use of reflection in CORBA Message-ID: <20101018223322.AFFD847254@hg.openjdk.java.net> Changeset: b7961cc671c6 Author: skoppar Date: 2010-09-24 22:45 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/corba/rev/b7961cc671c6 6891766: Vulnerabilities in use of reflection in CORBA Reviewed-by: hawtin ! src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java ! src/share/classes/com/sun/corba/se/impl/io/ValueHandlerImpl.java ! src/share/classes/com/sun/corba/se/impl/orb/PrefixParserAction.java ! src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java ! src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java ! src/share/classes/com/sun/corba/se/spi/orb/OperationFactory.java ! src/share/classes/com/sun/corba/se/spi/orb/ParserImplBase.java From abhi.saha at oracle.com Mon Oct 18 15:36:46 2010 From: abhi.saha at oracle.com (abhi.saha at oracle.com) Date: Mon, 18 Oct 2010 22:36:46 +0000 Subject: hg: jdk6/jdk6/jdk: 29 new changesets Message-ID: <20101018224037.51E1747256@hg.openjdk.java.net> Changeset: 2ed4d8e9159c Author: xuelei Date: 2010-06-12 00:10 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/2ed4d8e9159c 6914943: Implement final TLS renegotiation fix Summary: RFC 5746 implementation Reviewed-by: wetmore, weijun ! src/share/classes/sun/security/ssl/Alerts.java ! src/share/classes/sun/security/ssl/CipherSuite.java ! src/share/classes/sun/security/ssl/CipherSuiteList.java ! src/share/classes/sun/security/ssl/ClientHandshaker.java ! src/share/classes/sun/security/ssl/HandshakeMessage.java ! src/share/classes/sun/security/ssl/Handshaker.java ! src/share/classes/sun/security/ssl/HelloExtensions.java ! src/share/classes/sun/security/ssl/OutputRecord.java ! src/share/classes/sun/security/ssl/SSLEngineImpl.java ! src/share/classes/sun/security/ssl/SSLServerSocketImpl.java ! src/share/classes/sun/security/ssl/SSLSocketImpl.java ! src/share/classes/sun/security/ssl/ServerHandshaker.java ! test/sun/security/pkcs11/sslecc/CipherTest.java ! test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java ! test/sun/security/ssl/javax/net/ssl/NewAPIs/JSSERenegotiate.java ! test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java ! test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java ! test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/NoAuthClientAuth.java ! test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java ! test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java ! test/sun/security/ssl/sanity/interop/CipherTest.java Changeset: 080d5e740972 Author: asaha Date: 2010-06-13 07:10 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/080d5e740972 Merge Changeset: f591e8c11b09 Author: asaha Date: 2010-06-15 21:58 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/f591e8c11b09 Merge Changeset: 9a2c6c57caa1 Author: weijun Date: 2010-06-17 12:41 +0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/9a2c6c57caa1 6957564: Disclosure of DNS server IP address Reviewed-by: xuelei, chegar ! src/share/classes/com/sun/jndi/dns/DnsContextFactory.java Changeset: dafef320b7e5 Author: weijun Date: 2010-06-17 12:41 +0800 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/dafef320b7e5 6958060: Malformed AP-REQ crashes acceptor side Reviewed-by: valeriep, xuelei ! src/share/classes/sun/security/jgss/krb5/InitialToken.java Changeset: d5a9ad8ea905 Author: bae Date: 2010-06-22 12:15 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/d5a9ad8ea905 6925710: IndexColorModel.finalize can be made to double free Reviewed-by: prr ! src/share/classes/java/awt/image/IndexColorModel.java ! src/share/classes/sun/awt/image/BufImgSurfaceData.java ! src/share/native/sun/awt/image/BufImgSurfaceData.c Changeset: d77434402021 Author: rupashka Date: 2010-06-23 13:50 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/d77434402021 [pavel.porvatov] Fixed 6938813: Swing mutable statics [peter.zhelezniakov] Webrevs: http://sa.sfbay.sun.com/projects/swing_data/6-open/6938813.0 Regression test: test/javax/swing/Security/6938813/bug6938813.java ! src/share/classes/javax/swing/text/html/HTMLEditorKit.java ! src/share/classes/javax/swing/text/html/parser/DTD.java ! src/share/classes/javax/swing/text/html/parser/ParserDelegator.java + test/javax/swing/Security/6938813/bug6938813.java Changeset: 357bb3ba18c4 Author: prr Date: 2010-06-24 11:23 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/357bb3ba18c4 6963285: Crash in ICU Opentype layout engine due to mismatch in character counts Reviewed-by: bae, igor ! src/share/native/sun/font/layout/LayoutEngine.cpp Changeset: 28503855a149 Author: asaha Date: 2010-06-28 15:10 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/28503855a149 Merge Changeset: 9242f7e22b5d Author: bae Date: 2010-06-30 11:15 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/9242f7e22b5d 6963023: ZDI-CAN-809: Sun JRE JPEGImageWriter.writeImage Remote Code Execution Vulnerability Reviewed-by: prr ! src/share/native/sun/awt/image/jpeg/imageioJPEG.c Changeset: 34dd517c7183 Author: chegar Date: 2010-06-30 16:51 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/34dd517c7183 6926623: Thread clone issues Reviewed-by: hawtin ! src/share/classes/java/lang/Thread.java Changeset: 1f9e4b58a1f9 Author: bae Date: 2010-07-01 11:17 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/1f9e4b58a1f9 6963489: ZDI-CAN-803: Sun JRE ICC Profile Device Information Tag Remote Code Execution Vulnerability Reviewed-by: prr ! src/share/native/sun/java2d/cmm/lcms/LCMS.c ! src/share/native/sun/java2d/cmm/lcms/cmsxform.c Changeset: 7fe7aa39b5dc Author: michaelm Date: 2010-07-26 10:40 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/7fe7aa39b5dc 6952603: NetworkInterface reveals local network address to untrusted code Reviewed-by: chegar ! src/share/classes/java/net/NetworkInterface.java Changeset: 3f8ebe7db6e0 Author: michaelm Date: 2010-07-26 10:56 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/3f8ebe7db6e0 6952017: HttpURLConnection chunked encoding issue (Http request splitting) Reviewed-by: chegar ! src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Changeset: 5789c4246c0c Author: asaha Date: 2010-07-27 14:47 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/5789c4246c0c Merge Changeset: 9dcb9df28fc1 Author: asaha Date: 2010-08-09 09:49 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/9dcb9df28fc1 Merge Changeset: a049121b193b Author: chegar Date: 2010-08-11 09:34 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/a049121b193b 6974093: Thread.clone should NOT invoke addUnstarted on started threads Reviewed-by: dholmes, coffeys ! src/share/classes/java/lang/Thread.java Changeset: cc18d89db2f8 Author: asaha Date: 2010-08-12 08:00 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/cc18d89db2f8 Merge Changeset: 65605bd0da24 Author: asaha Date: 2010-09-09 14:46 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/65605bd0da24 Merge - src/share/classes/javax/swing/text/html/parser/html32.bdtd Changeset: 068cae30ff10 Author: asaha Date: 2010-09-23 12:05 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/068cae30ff10 Merge Changeset: 6e389e6349c9 Author: michaelm Date: 2010-09-23 08:50 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6e389e6349c9 6980004: limit HTTP request cookie headers in HttpURLConnection 6961084: limit setting of some request headers in HttpURLConnection Reviewed-by: chegar ! src/share/classes/sun/net/www/MessageHeader.java ! src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java Changeset: c4573f15b0f8 Author: michaelm Date: 2010-09-23 08:56 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/c4573f15b0f8 6981426: limit use of TRACE method in HttpURLConnection Reviewed-by: chegar ! src/share/classes/java/net/HttpURLConnection.java Changeset: 1eaaf0f77762 Author: asaha Date: 2010-09-23 12:07 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/1eaaf0f77762 Merge Changeset: bb1c74cae929 Author: alexp Date: 2010-09-28 18:59 +0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/bb1c74cae929 6622002: UIDefault.ProxyLazyValue has unsafe reflection usage Reviewed-by: malenkov ! src/share/classes/javax/swing/UIDefaults.java + test/javax/swing/UIDefaults/6622002/bug6622002.java Changeset: 57681551c11e Author: skoppar Date: 2010-09-28 03:58 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/57681551c11e 6559775: Race allows defaultReadObject to be invoked instead of readFields during deserialization Reviewed-by: hawtin ! make/java/java/FILES_java.gmk ! src/share/classes/java/io/ObjectInputStream.java ! src/share/classes/java/io/ObjectOutputStream.java + src/share/classes/java/io/SerialCallbackContext.java + test/java/io/Serializable/6559775/README + test/java/io/Serializable/6559775/SerialRace.java + test/java/io/Serializable/6559775/SerialVictim.java + test/java/io/Serializable/6559775/Test6559775.sh Changeset: 6b2459c08142 Author: skoppar Date: 2010-09-28 04:01 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/6b2459c08142 6966692: defaultReadObject can set a field multiple times Reviewed-by: hawtin ! src/share/classes/java/io/ObjectStreamClass.java + test/java/io/Serializable/6966692/Attack.java + test/java/io/Serializable/6966692/README + test/java/io/Serializable/6966692/Test6966692.sh + test/java/io/Serializable/6966692/Victim.java Changeset: 02b79f1c8c17 Author: asaha Date: 2010-10-05 09:45 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/02b79f1c8c17 Merge Changeset: 9820f99c66fb Author: asaha Date: 2010-10-07 16:32 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/9820f99c66fb 6990437: Update with correct copyright info for source and test files from SSR10_02 fixes Reviewed-by: darcy ! src/share/classes/java/io/SerialCallbackContext.java ! test/java/io/Serializable/6559775/SerialRace.java ! test/java/io/Serializable/6559775/SerialVictim.java ! test/java/io/Serializable/6559775/Test6559775.sh ! test/java/io/Serializable/6966692/Attack.java ! test/java/io/Serializable/6966692/Test6966692.sh ! test/java/io/Serializable/6966692/Victim.java Changeset: 9ee81cf7f507 Author: asaha Date: 2010-10-18 15:35 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/9ee81cf7f507 Merge From omajid at redhat.com Tue Oct 19 10:11:49 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 19 Oct 2010 13:11:49 -0400 Subject: Request to backport 6979979: Rounding error in font sizes selected by the GTK Look and Feel Message-ID: <4CBDD155.900@redhat.com> Hi, I would like to backport the following changeset to openjdk6: changeset: 2720:bb733c150f94 user: omajid date: Tue Sep 14 10:45:38 2010 -0400 summary: 6979979: Rounding error in font sizes selected by the GTK Look and Feel It selects a better font size the when Swing is using the GTKLookAndFeel. Thanks, Omair From joe.darcy at oracle.com Tue Oct 19 12:18:17 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 19 Oct 2010 12:18:17 -0700 Subject: Request to backport 6979979: Rounding error in font sizes selected by the GTK Look and Feel In-Reply-To: <4CBDDAD5.1010809@redhat.com> References: <4CBDD155.900@redhat.com> <20101019173816.GD3392@rivendell.middle-earth.co.uk> <4CBDDAD5.1010809@redhat.com> Message-ID: <4CBDEEF9.6030808@oracle.com> Omair Majid wrote: > On 10/19/2010 01:38 PM, Dr Andrew John Hughes wrote: >> On 13:11 Tue 19 Oct , Omair Majid wrote: >>> Hi, >>> >>> I would like to backport the following changeset to openjdk6: >>> >>> changeset: 2720:bb733c150f94 >>> user: omajid >>> date: Tue Sep 14 10:45:38 2010 -0400 >>> summary: 6979979: Rounding error in font sizes selected by the GTK >>> Look and Feel >>> >>> It selects a better font size the when Swing is using the >>> GTKLookAndFeel. >>> >>> Thanks, >>> Omair >> >> Is this backported in IcedTea6? > > As far as I am aware, no. I am going to add this to IcedTea6 if the > openjdk6 devs are ok with adding it to openjdk6. > > Cheers, > Omair Hello Omair. Approved to be backported to OpenJDK 6 b21 (the current build). Thanks, -Joe From abhi.saha at oracle.com Tue Oct 19 16:56:05 2010 From: abhi.saha at oracle.com (abhi.saha at oracle.com) Date: Tue, 19 Oct 2010 23:56:05 +0000 Subject: hg: jdk6/jdk6/jdk: 6993206: Removing non-functional tests. Message-ID: <20101019235614.5AB82472A0@hg.openjdk.java.net> Changeset: f4ad6e24e75d Author: asaha Date: 2010-10-19 16:51 -0700 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/f4ad6e24e75d 6993206: Removing non-functional tests. Reviewed-by: darcy - test/java/io/Serializable/6559775/README - test/java/io/Serializable/6559775/SerialRace.java - test/java/io/Serializable/6559775/SerialVictim.java - test/java/io/Serializable/6559775/Test6559775.sh - test/java/io/Serializable/6966692/Attack.java - test/java/io/Serializable/6966692/README - test/java/io/Serializable/6966692/Test6966692.sh - test/java/io/Serializable/6966692/Victim.java From omajid at redhat.com Wed Oct 20 11:24:26 2010 From: omajid at redhat.com (Omair Majid) Date: Wed, 20 Oct 2010 14:24:26 -0400 Subject: Request to backport 6979979: Rounding error in font sizes selected by the GTK Look and Feel In-Reply-To: <4CBDEEF9.6030808@oracle.com> References: <4CBDD155.900@redhat.com> <20101019173816.GD3392@rivendell.middle-earth.co.uk> <4CBDDAD5.1010809@redhat.com> <4CBDEEF9.6030808@oracle.com> Message-ID: <4CBF33DA.2000009@redhat.com> On 10/19/2010 03:18 PM, Joe Darcy wrote: > Omair Majid wrote: >> On 10/19/2010 01:38 PM, Dr Andrew John Hughes wrote: >>> On 13:11 Tue 19 Oct , Omair Majid wrote: >>>> Hi, >>>> >>>> I would like to backport the following changeset to openjdk6: >>>> >>>> changeset: 2720:bb733c150f94 >>>> user: omajid >>>> date: Tue Sep 14 10:45:38 2010 -0400 >>>> summary: 6979979: Rounding error in font sizes selected by the GTK >>>> Look and Feel >>>> >>>> It selects a better font size the when Swing is using the >>>> GTKLookAndFeel. >>>> >>>> Thanks, >>>> Omair >>> >>> Is this backported in IcedTea6? >> >> As far as I am aware, no. I am going to add this to IcedTea6 if the >> openjdk6 devs are ok with adding it to openjdk6. >> >> Cheers, >> Omair > > Hello Omair. > > Approved to be backported to OpenJDK 6 b21 (the current build). > > Thanks, > > -Joe Thanks for the approval. Unfortunately, the patch does not apply straight-away. There was some refactoring in FontManager and FontUtilies - the patch requires changing the class from FontUtilites to FontManager. The webrev: http://cr.openjdk.java.net/~omajid/webrevs/gtk-floating-point-font-size-support-jdk6/webrev.00/ is identical to the original webrev for the fix: http://cr.openjdk.java.net/~omajid/webrevs/gtk-floating-point-font-size-support/webrev.01/ with the exception of the FontUtilties -> FontManager rename. Can I still go ahead and backport? Thanks, Omair From philip.race at oracle.com Wed Oct 20 11:37:27 2010 From: philip.race at oracle.com (Phil Race) Date: Wed, 20 Oct 2010 11:37:27 -0700 Subject: Request to backport 6979979: Rounding error in font sizes selected by the GTK Look and Feel In-Reply-To: <4CBF33DA.2000009@redhat.com> References: <4CBDD155.900@redhat.com> <20101019173816.GD3392@rivendell.middle-earth.co.uk> <4CBDDAD5.1010809@redhat.com> <4CBDEEF9.6030808@oracle.com> <4CBF33DA.2000009@redhat.com> Message-ID: <4CBF36E7.6040103@oracle.com> That's an inconsequential difference, so I can't think of any reason why not .. the change looks fine to me -phil. On 10/20/2010 11:24 AM, Omair Majid wrote: > On 10/19/2010 03:18 PM, Joe Darcy wrote: >> Omair Majid wrote: >>> On 10/19/2010 01:38 PM, Dr Andrew John Hughes wrote: >>>> On 13:11 Tue 19 Oct , Omair Majid wrote: >>>>> Hi, >>>>> >>>>> I would like to backport the following changeset to openjdk6: >>>>> >>>>> changeset: 2720:bb733c150f94 >>>>> user: omajid >>>>> date: Tue Sep 14 10:45:38 2010 -0400 >>>>> summary: 6979979: Rounding error in font sizes selected by the GTK >>>>> Look and Feel >>>>> >>>>> It selects a better font size the when Swing is using the >>>>> GTKLookAndFeel. >>>>> >>>>> Thanks, >>>>> Omair >>>> >>>> Is this backported in IcedTea6? >>> >>> As far as I am aware, no. I am going to add this to IcedTea6 if the >>> openjdk6 devs are ok with adding it to openjdk6. >>> >>> Cheers, >>> Omair >> >> Hello Omair. >> >> Approved to be backported to OpenJDK 6 b21 (the current build). >> >> Thanks, >> >> -Joe > > Thanks for the approval. Unfortunately, the patch does not apply > straight-away. There was some refactoring in FontManager and > FontUtilies - the patch requires changing the class from FontUtilites > to FontManager. > > The webrev: > http://cr.openjdk.java.net/~omajid/webrevs/gtk-floating-point-font-size-support-jdk6/webrev.00/ > > is identical to the original webrev for the fix: > http://cr.openjdk.java.net/~omajid/webrevs/gtk-floating-point-font-size-support/webrev.01/ > > with the exception of the FontUtilties -> FontManager rename. > > Can I still go ahead and backport? > > Thanks, > Omair From joe.darcy at oracle.com Wed Oct 20 11:42:57 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Wed, 20 Oct 2010 11:42:57 -0700 Subject: Request to backport 6979979: Rounding error in font sizes selected by the GTK Look and Feel In-Reply-To: <4CBF36E7.6040103@oracle.com> References: <4CBDD155.900@redhat.com> <20101019173816.GD3392@rivendell.middle-earth.co.uk> <4CBDDAD5.1010809@redhat.com> <4CBDEEF9.6030808@oracle.com> <4CBF33DA.2000009@redhat.com> <4CBF36E7.6040103@oracle.com> Message-ID: <4CBF3831.9@oracle.com> Phil Race wrote: > That's an inconsequential difference, so I can't think of any reason > why not .. the change looks fine to me Then still approved to go back! Thanks, -Joe > > -phil. > > On 10/20/2010 11:24 AM, Omair Majid wrote: >> On 10/19/2010 03:18 PM, Joe Darcy wrote: >>> Omair Majid wrote: >>>> On 10/19/2010 01:38 PM, Dr Andrew John Hughes wrote: >>>>> On 13:11 Tue 19 Oct , Omair Majid wrote: >>>>>> Hi, >>>>>> >>>>>> I would like to backport the following changeset to openjdk6: >>>>>> >>>>>> changeset: 2720:bb733c150f94 >>>>>> user: omajid >>>>>> date: Tue Sep 14 10:45:38 2010 -0400 >>>>>> summary: 6979979: Rounding error in font sizes selected by the GTK >>>>>> Look and Feel >>>>>> >>>>>> It selects a better font size the when Swing is using the >>>>>> GTKLookAndFeel. >>>>>> >>>>>> Thanks, >>>>>> Omair >>>>> >>>>> Is this backported in IcedTea6? >>>> >>>> As far as I am aware, no. I am going to add this to IcedTea6 if the >>>> openjdk6 devs are ok with adding it to openjdk6. >>>> >>>> Cheers, >>>> Omair >>> >>> Hello Omair. >>> >>> Approved to be backported to OpenJDK 6 b21 (the current build). >>> >>> Thanks, >>> >>> -Joe >> >> Thanks for the approval. Unfortunately, the patch does not apply >> straight-away. There was some refactoring in FontManager and >> FontUtilies - the patch requires changing the class from FontUtilites >> to FontManager. >> >> The webrev: >> http://cr.openjdk.java.net/~omajid/webrevs/gtk-floating-point-font-size-support-jdk6/webrev.00/ >> >> is identical to the original webrev for the fix: >> http://cr.openjdk.java.net/~omajid/webrevs/gtk-floating-point-font-size-support/webrev.01/ >> >> with the exception of the FontUtilties -> FontManager rename. >> >> Can I still go ahead and backport? >> >> Thanks, >> Omair > From omajid at redhat.com Wed Oct 20 12:01:45 2010 From: omajid at redhat.com (omajid at redhat.com) Date: Wed, 20 Oct 2010 19:01:45 +0000 Subject: hg: jdk6/jdk6/jdk: 6979979: Rounding error in font sizes selected by the GTK Look and Feel Message-ID: <20101020190153.A881A472DB@hg.openjdk.java.net> Changeset: 9216ec4e4c14 Author: omajid Date: 2010-09-14 10:45 -0400 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/9216ec4e4c14 6979979: Rounding error in font sizes selected by the GTK Look and Feel Summary: Use floating point font sizes Reviewed-by: prr ! src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java ! src/share/classes/sun/font/FontManager.java From omajid at redhat.com Wed Oct 20 12:06:56 2010 From: omajid at redhat.com (Omair Majid) Date: Wed, 20 Oct 2010 15:06:56 -0400 Subject: Request to backport 6979979: Rounding error in font sizes selected by the GTK Look and Feel In-Reply-To: <4CBF3831.9@oracle.com> References: <4CBDD155.900@redhat.com> <20101019173816.GD3392@rivendell.middle-earth.co.uk> <4CBDDAD5.1010809@redhat.com> <4CBDEEF9.6030808@oracle.com> <4CBF33DA.2000009@redhat.com> <4CBF36E7.6040103@oracle.com> <4CBF3831.9@oracle.com> Message-ID: <4CBF3DD0.5050708@redhat.com> On 10/20/2010 02:42 PM, Joe Darcy wrote: > Phil Race wrote: >> That's an inconsequential difference, so I can't think of any reason >> why not .. the change looks fine to me > Thanks for the review Phil. > Then still approved to go back! > Thanks for the approval Joe. I have pushed the change. Cheers, Omair > Thanks, > > -Joe > >> >> -phil. >> >> On 10/20/2010 11:24 AM, Omair Majid wrote: >>> On 10/19/2010 03:18 PM, Joe Darcy wrote: >>>> Omair Majid wrote: >>>>> On 10/19/2010 01:38 PM, Dr Andrew John Hughes wrote: >>>>>> On 13:11 Tue 19 Oct , Omair Majid wrote: >>>>>>> Hi, >>>>>>> >>>>>>> I would like to backport the following changeset to openjdk6: >>>>>>> >>>>>>> changeset: 2720:bb733c150f94 >>>>>>> user: omajid >>>>>>> date: Tue Sep 14 10:45:38 2010 -0400 >>>>>>> summary: 6979979: Rounding error in font sizes selected by the GTK >>>>>>> Look and Feel >>>>>>> >>>>>>> It selects a better font size the when Swing is using the >>>>>>> GTKLookAndFeel. >>>>>>> >>>>>>> Thanks, >>>>>>> Omair >>>>>> >>>>>> Is this backported in IcedTea6? >>>>> >>>>> As far as I am aware, no. I am going to add this to IcedTea6 if the >>>>> openjdk6 devs are ok with adding it to openjdk6. >>>>> >>>>> Cheers, >>>>> Omair >>>> >>>> Hello Omair. >>>> >>>> Approved to be backported to OpenJDK 6 b21 (the current build). >>>> >>>> Thanks, >>>> >>>> -Joe >>> >>> Thanks for the approval. Unfortunately, the patch does not apply >>> straight-away. There was some refactoring in FontManager and >>> FontUtilies - the patch requires changing the class from FontUtilites >>> to FontManager. >>> >>> The webrev: >>> http://cr.openjdk.java.net/~omajid/webrevs/gtk-floating-point-font-size-support-jdk6/webrev.00/ >>> >>> is identical to the original webrev for the fix: >>> http://cr.openjdk.java.net/~omajid/webrevs/gtk-floating-point-font-size-support/webrev.01/ >>> >>> with the exception of the FontUtilties -> FontManager rename. >>> >>> Can I still go ahead and backport? >>> >>> Thanks, >>> Omair >> > From ahughes at redhat.com Thu Oct 21 03:32:05 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 21 Oct 2010 11:32:05 +0100 Subject: About time for b21? In-Reply-To: <20101018142812.GC31704@rivendell.middle-earth.co.uk> References: <4CB7A882.3080008@oracle.com> <20101018142812.GC31704@rivendell.middle-earth.co.uk> Message-ID: <20101021103205.GB5809@bree.redhat.com> On 15:28 Mon 18 Oct , Dr Andrew John Hughes wrote: > On 18:04 Thu 14 Oct , Joe Darcy wrote: > > Hello. > > > > With Andrew's sync of HS19 into OpenJDK 6 and the recent batch of > > security fixes coming real soon now, I think it is about time to have > > b21. I'd hold b21 for the remaining bug fixes pushed to HS19 that are > > not quite promoted yet. > > > > Are there any other changes that should be in b21? > > > > -Joe > > http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-September/002008.html is > still awaiting review. > > Two of the three suggestions on http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-August/001954.html > are also still pending (haven't had time to follow them up). > > 6678385 did go in, so 6853592 could do with also going in. See: > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-October/010509.html > 6853592: VM test nsk.regression.b4261880 fails with "X Error of failed request: BadWindow" inconsistently. > > I'll post webrevs for these three if they sound ok for OpenJDK6 b21. > > I was going to look at pushing the XRender/DirectX backport upstream, but I think that > could do with more soak time in IcedTea6. We'll do that in b22. > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 Any thoughts on this, Joe? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Fri Oct 22 17:32:20 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 22 Oct 2010 17:32:20 -0700 Subject: javac failure In-Reply-To: <4C8A65AA.5050902@oracle.com> References: <20100910165842.GC14990@rivendell.middle-earth.co.uk> <4C8A65AA.5050902@oracle.com> Message-ID: <4CC22D14.2020100@oracle.com> Following up, Jon and Maurizio, do you see an issue with backporting these two patches to OpenJDK b21? Thanks, -Joe Jonathan Gibbons wrote: > cc: compiler-dev > > -- Jon > > > > On 09/10/2010 09:58 AM, Dr Andrew John Hughes wrote: >> When running the attached test case (thanks to Deepak Bhole) through >> javac, we found it fails with: >> >> Test.java:14: incompatible types; inferred type argument(s) >> java.lang.Object do not conform to bounds of type variable(s) T >> found :java.util.ArrayList >> required: java.util.ArrayList >> ArrayList l = test(new ArrayList()); >> ^ >> 1 error >> >> On both the proprietary Oracle JDK and OpenJDK7, this file compiles. >> >> By backporting the following changesets: >> >> changeset: 298:22872b24d38c >> user: mcimadamore >> date: Tue Jun 16 10:46:37 2009 +0100 >> summary: 6638712: Inference with wildcard types causes selection >> of inapplicable method >> >> changeset: 395:dda7e13f09fb >> user: mcimadamore >> date: Tue Sep 01 14:53:39 2009 +0100 >> summary: 6650759: Inference of formal type parameter (unused in >> formal parameters) is not performed >> >> (6650759 is dependent on the changes in 6638712) >> >> we managed to get the file to compile. >> >> A webrev of 6638712 is available at: >> >> http://cr.openjdk.java.net/~andrew/6638712/webrev.01/ >> >> and 6650759 will follow if appropriate. >> >> The following minor changes had to be made to 6638712 to work with >> current OpenJDK javac: >> >> * The use of Types.createErrorType was replaced with Types.errType as >> in other cases in that file. >> This avoids the need to backport: >> >> changeset: 109:91eea580fbe9 >> parent: 106:5a9b808557b6 >> user: jjg >> date: Tue Sep 09 10:28:21 2008 -0700 >> summary: 6557752: Original type of an AST should be made >> available even if it is replaced with an ErrorType >> >> but that can be done too if necessary. >> >> * The final variable invalidInstanceException was initialised. >> * The test case output was changed to match that output by patched >> OpenJDK6 (which is similar but not identical). >> * The test case code files were updated as in: >> >> changeset: 383:ed31953ca025 >> user: jjg >> date: Thu Aug 27 11:08:27 2009 -0700 >> summary: 6875336: some tests should use /nodynamiccopyright/ >> >> so as to avoid introducing Sun copyright headers. >> >> Ok to push this backport to OpenJDK6? Or do you have a simpler >> solution for fixing this issue? >> >> Thanks, >> > From joe.darcy at oracle.com Fri Oct 22 17:46:03 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 22 Oct 2010 17:46:03 -0700 Subject: About time for b21? In-Reply-To: <20101021103205.GB5809@bree.redhat.com> References: <4CB7A882.3080008@oracle.com> <20101018142812.GC31704@rivendell.middle-earth.co.uk> <20101021103205.GB5809@bree.redhat.com> Message-ID: <4CC2304B.6010709@oracle.com> Dr Andrew John Hughes wrote: > On 15:28 Mon 18 Oct , Dr Andrew John Hughes wrote: > >> On 18:04 Thu 14 Oct , Joe Darcy wrote: >> >>> Hello. >>> >>> With Andrew's sync of HS19 into OpenJDK 6 and the recent batch of >>> security fixes coming real soon now, I think it is about time to have >>> b21. I'd hold b21 for the remaining bug fixes pushed to HS19 that are >>> not quite promoted yet. >>> >>> Are there any other changes that should be in b21? >>> >>> -Joe >>> >> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-September/002008.html is >> still awaiting review. >> Ah, sorry for letting that fall through the cracks and for the belated reply -- reminder email just sent. >> Two of the three suggestions on http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-August/001954.html >> are also still pending (haven't had time to follow them up). >> >> 6678385 did go in, so 6853592 could do with also going in. See: >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-October/010509.html >> 6853592: VM test nsk.regression.b4261880 fails with "X Error of failed request: BadWindow" inconsistently. >> 6853592 is approved to be backported in b21. >> I'll post webrevs for these three if they sound ok for OpenJDK6 b21. >> >> I was going to look at pushing the XRender/DirectX backport upstream, but I think that >> could do with more soak time in IcedTea6. We'll do that in b22. >> That approach sounds sensible. Cheers, -Joe >> -- >> Andrew :) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >> > > Any thoughts on this, Joe? > From philip.race at oracle.com Sun Oct 24 13:05:39 2010 From: philip.race at oracle.com (Phil Race) Date: Sun, 24 Oct 2010 13:05:39 -0700 Subject: OpenJDK6 regression, javax.swing.UIDefaults broken In-Reply-To: References: Message-ID: <4CC49193.8020803@oracle.com> SFAIK bugzilla is still officially just for tracking patches. I've cc'd the engineer who created the 6 open fix. Hopefully that should be all that's needed. The fix looks identical to the 6u22 one but the problem may be that 6-open was forked off an early jdk7 build so that might mean there's an issue resulting from that divergence, but that's just a guess. BTW there is a specific 6-dev list and I think any further discussion ought to move there after this reply: So I've cc'd jdk6-dev at openjdk.java.net -phil. Clemens Eisserer wrote: > Hi, > > After updating OpenJDK6 recently an application I've written is > broken, when running it as Applet in an AppletViewer. > The app displays boolean values in a JTable, using > JTable.getDefaultRenderer(Class) to get the CellRenderer. > After digging a bit deeper, I found the problem is the > checkAccess()-call when loading "javax.swing.JTable$BooleanRenderer" > in javax.swing.UIDefaults.java : 1103. > > The code there looks like this: > >> c = Class.forName(className, true, (ClassLoader)cl); >> checkAccess(c.getModifiers()); //Fails, unfourtunatly Exception-Handler kills Exception, so no idea what it is. >> if (methodName != null) { >> > > In a 2-3 weeks old OpenJDK7 repo, I didn't find the > checkAccess()-Call, it simply says: > >> c = Class.forName(className, true, (ClassLoader)cl); >> if (methodName != null) { >> > > Looks like some kind of emergency security fix ;) > Oracle's JDK6u22 works fine however. > > Should I report this against bugs.sun.com or the OpenJDK bugzilla? > I know for now only OpenJDK seems affected, but I wonder if the oracle > guys look at bugzilla at all? > > Thanks, Clemens > > PS: Tetscase attached. > From Alexander.Potochkin at oracle.com Mon Oct 25 09:45:26 2010 From: Alexander.Potochkin at oracle.com (Alexander Potochkin) Date: Mon, 25 Oct 2010 20:45:26 +0400 Subject: OpenJDK6 regression, javax.swing.UIDefaults broken In-Reply-To: <4CC49193.8020803@oracle.com> References: <4CC49193.8020803@oracle.com> Message-ID: <4CC5B426.1030509@oracle.com> Hello Phil Hello Clement Indeed, it was an urgent fix, to make it work CR #6795356 has to be backported to 6-open when it is there, the problem will be gone I am not sure who takes care of 6-open, Phil could you help me to pass this information to the 6-open team? Thanks alexp > SFAIK bugzilla is still officially just for tracking patches. > I've cc'd the engineer who created the 6 open fix. Hopefully that > should be all that's needed. > The fix looks identical to the 6u22 one but the problem may be > that 6-open was forked off an early jdk7 build so that might mean > there's an issue resulting from that divergence, but that's just a guess. > > BTW there is a specific 6-dev list and I think any further discussion > ought to move there > after this reply: So I've cc'd jdk6-dev at openjdk.java.net > > -phil. > > Clemens Eisserer wrote: >> Hi, >> >> After updating OpenJDK6 recently an application I've written is >> broken, when running it as Applet in an AppletViewer. >> The app displays boolean values in a JTable, using >> JTable.getDefaultRenderer(Class) to get the CellRenderer. >> After digging a bit deeper, I found the problem is the >> checkAccess()-call when loading "javax.swing.JTable$BooleanRenderer" >> in javax.swing.UIDefaults.java : 1103. >> >> The code there looks like this: >>> c = Class.forName(className, true, (ClassLoader)cl); >>> checkAccess(c.getModifiers()); //Fails, unfourtunatly >>> Exception-Handler kills Exception, so no idea what it is. >>> if (methodName != null) { >> >> In a 2-3 weeks old OpenJDK7 repo, I didn't find the >> checkAccess()-Call, it simply says: >>> c = Class.forName(className, true, (ClassLoader)cl); >>> if (methodName != null) { >> >> Looks like some kind of emergency security fix ;) >> Oracle's JDK6u22 works fine however. >> >> Should I report this against bugs.sun.com or the OpenJDK bugzilla? >> I know for now only OpenJDK seems affected, but I wonder if the oracle >> guys look at bugzilla at all? >> >> Thanks, Clemens >> >> PS: Tetscase attached. > From joe.darcy at oracle.com Mon Oct 25 10:02:44 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Mon, 25 Oct 2010 10:02:44 -0700 Subject: OpenJDK6 regression, javax.swing.UIDefaults broken In-Reply-To: <4CC5B426.1030509@oracle.com> References: <4CC49193.8020803@oracle.com> <4CC5B426.1030509@oracle.com> Message-ID: <4CC5B834.2040203@oracle.com> Hello. Alexander Potochkin wrote: > Hello Phil > Hello Clement > > Indeed, it was an urgent fix, > to make it work CR #6795356 has to be backported to 6-open > > when it is there, the problem will be gone > > I am not sure who takes care of 6-open, > Phil could you help me to pass this information to the 6-open team? I approve 6795356 being backported to OpenJDK 6 b21 if the affected files are branded appropriately with Oracle copyrights. Alexander, if you'd like you're welcome do to the backport. -Joe > > Thanks > alexp > >> SFAIK bugzilla is still officially just for tracking patches. >> I've cc'd the engineer who created the 6 open fix. Hopefully that >> should be all that's needed. >> The fix looks identical to the 6u22 one but the problem may be >> that 6-open was forked off an early jdk7 build so that might mean >> there's an issue resulting from that divergence, but that's just a >> guess. >> >> BTW there is a specific 6-dev list and I think any further discussion >> ought to move there >> after this reply: So I've cc'd jdk6-dev at openjdk.java.net >> >> -phil. >> >> Clemens Eisserer wrote: >>> Hi, >>> >>> After updating OpenJDK6 recently an application I've written is >>> broken, when running it as Applet in an AppletViewer. >>> The app displays boolean values in a JTable, using >>> JTable.getDefaultRenderer(Class) to get the CellRenderer. >>> After digging a bit deeper, I found the problem is the >>> checkAccess()-call when loading "javax.swing.JTable$BooleanRenderer" >>> in javax.swing.UIDefaults.java : 1103. >>> >>> The code there looks like this: >>>> c = Class.forName(className, true, (ClassLoader)cl); >>>> checkAccess(c.getModifiers()); //Fails, unfourtunatly >>>> Exception-Handler kills Exception, so no idea what it is. >>>> if (methodName != null) { >>> >>> In a 2-3 weeks old OpenJDK7 repo, I didn't find the >>> checkAccess()-Call, it simply says: >>>> c = Class.forName(className, true, (ClassLoader)cl); >>>> if (methodName != null) { >>> >>> Looks like some kind of emergency security fix ;) >>> Oracle's JDK6u22 works fine however. >>> >>> Should I report this against bugs.sun.com or the OpenJDK bugzilla? >>> I know for now only OpenJDK seems affected, but I wonder if the oracle >>> guys look at bugzilla at all? >>> >>> Thanks, Clemens >>> >>> PS: Tetscase attached. >> > From ahughes at redhat.com Tue Oct 26 07:21:58 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Tue, 26 Oct 2010 14:21:58 +0000 Subject: hg: jdk6/jdk6/jdk: 6795356: Leak caused by javax.swing.UIDefaults.ProxyLazyValue.acc Message-ID: <20101026142216.A58DC47439@hg.openjdk.java.net> Changeset: 826806a193c8 Author: alexp Date: 2010-10-26 15:21 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/826806a193c8 6795356: Leak caused by javax.swing.UIDefaults.ProxyLazyValue.acc Reviewed-by: hawtin ! src/share/classes/javax/swing/JTable.java ! src/share/classes/javax/swing/plaf/metal/OceanTheme.java ! src/share/classes/sun/swing/SwingLazyValue.java + test/javax/swing/UIDefaults/6795356/SwingLazyValueTest.java + test/javax/swing/UIDefaults/6795356/TableTest.java + test/javax/swing/UIDefaults/6795356/bug6795356.java From ahughes at redhat.com Tue Oct 26 07:24:52 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 26 Oct 2010 15:24:52 +0100 Subject: OpenJDK6 regression, javax.swing.UIDefaults broken In-Reply-To: <4CC5B834.2040203@oracle.com> References: <4CC49193.8020803@oracle.com> <4CC5B426.1030509@oracle.com> <4CC5B834.2040203@oracle.com> Message-ID: <20101026142452.GK6347@rivendell.middle-earth.co.uk> On 10:02 Mon 25 Oct , Joe Darcy wrote: > Hello. > > Alexander Potochkin wrote: > > Hello Phil > > Hello Clement > > > > Indeed, it was an urgent fix, > > to make it work CR #6795356 has to be backported to 6-open > > > > when it is there, the problem will be gone > > > > I am not sure who takes care of 6-open, > > Phil could you help me to pass this information to the 6-open team? > > I approve 6795356 being backported to OpenJDK 6 b21 if the affected > files are branded appropriately with Oracle copyrights. > > Alexander, if you'd like you're welcome do to the backport. > I've pushed this with the amended copyrights. I have to admit I'd feel a little better about OpenJDK6 if it was being considered as a matter of course when fixing such regressions, rather than us relying on the issue being caught like this. > -Joe > > > > > Thanks > > alexp > > > >> SFAIK bugzilla is still officially just for tracking patches. > >> I've cc'd the engineer who created the 6 open fix. Hopefully that > >> should be all that's needed. > >> The fix looks identical to the 6u22 one but the problem may be > >> that 6-open was forked off an early jdk7 build so that might mean > >> there's an issue resulting from that divergence, but that's just a > >> guess. > >> > >> BTW there is a specific 6-dev list and I think any further discussion > >> ought to move there > >> after this reply: So I've cc'd jdk6-dev at openjdk.java.net > >> > >> -phil. > >> > >> Clemens Eisserer wrote: > >>> Hi, > >>> > >>> After updating OpenJDK6 recently an application I've written is > >>> broken, when running it as Applet in an AppletViewer. > >>> The app displays boolean values in a JTable, using > >>> JTable.getDefaultRenderer(Class) to get the CellRenderer. > >>> After digging a bit deeper, I found the problem is the > >>> checkAccess()-call when loading "javax.swing.JTable$BooleanRenderer" > >>> in javax.swing.UIDefaults.java : 1103. > >>> > >>> The code there looks like this: > >>>> c = Class.forName(className, true, (ClassLoader)cl); > >>>> checkAccess(c.getModifiers()); //Fails, unfourtunatly > >>>> Exception-Handler kills Exception, so no idea what it is. > >>>> if (methodName != null) { > >>> > >>> In a 2-3 weeks old OpenJDK7 repo, I didn't find the > >>> checkAccess()-Call, it simply says: > >>>> c = Class.forName(className, true, (ClassLoader)cl); > >>>> if (methodName != null) { > >>> > >>> Looks like some kind of emergency security fix ;) > >>> Oracle's JDK6u22 works fine however. > >>> > >>> Should I report this against bugs.sun.com or the OpenJDK bugzilla? > >>> I know for now only OpenJDK seems affected, but I wonder if the oracle > >>> guys look at bugzilla at all? > >>> > >>> Thanks, Clemens > >>> > >>> PS: Tetscase attached. > >> > > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Oct 26 08:47:25 2010 From: ahughes at redhat.com (ahughes at redhat.com) Date: Tue, 26 Oct 2010 15:47:25 +0000 Subject: hg: jdk6/jdk6/jdk: 6853592: VM test nsk.regression.b4261880 fails with "X Error of failed request: BadWindow" inconsistently. Message-ID: <20101026154733.5DE324743F@hg.openjdk.java.net> Changeset: 2ea7a84adb54 Author: dcherepanov Date: 2010-10-26 16:47 +0100 URL: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/2ea7a84adb54 6853592: VM test nsk.regression.b4261880 fails with "X Error of failed request: BadWindow" inconsistently. Reviewed-by: art, anthony ! src/solaris/classes/sun/awt/X11/XToolkit.java From ahughes at redhat.com Tue Oct 26 10:23:03 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 26 Oct 2010 18:23:03 +0100 Subject: About time for b21? In-Reply-To: <4CC2304B.6010709@oracle.com> References: <4CB7A882.3080008@oracle.com> <20101018142812.GC31704@rivendell.middle-earth.co.uk> <20101021103205.GB5809@bree.redhat.com> <4CC2304B.6010709@oracle.com> Message-ID: <20101026172303.GA29779@rivendell.middle-earth.co.uk> On 17:46 Fri 22 Oct , Joe Darcy wrote: > Dr Andrew John Hughes wrote: > > On 15:28 Mon 18 Oct , Dr Andrew John Hughes wrote: > > > >> On 18:04 Thu 14 Oct , Joe Darcy wrote: > >> > >>> Hello. > >>> > >>> With Andrew's sync of HS19 into OpenJDK 6 and the recent batch of > >>> security fixes coming real soon now, I think it is about time to have > >>> b21. I'd hold b21 for the remaining bug fixes pushed to HS19 that are > >>> not quite promoted yet. > >>> > >>> Are there any other changes that should be in b21? > >>> > >>> -Joe > >>> > >> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-September/002008.html is > >> still awaiting review. > >> > > Ah, sorry for letting that fall through the cracks and for the belated > reply -- reminder email just sent. > Thanks. > >> Two of the three suggestions on http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-August/001954.html > >> are also still pending (haven't had time to follow them up). > >> > >> 6678385 did go in, so 6853592 could do with also going in. See: > >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-October/010509.html > >> 6853592: VM test nsk.regression.b4261880 fails with "X Error of failed request: BadWindow" inconsistently. > >> > > 6853592 is approved to be backported in b21. > Pushed. > >> I'll post webrevs for these three if they sound ok for OpenJDK6 b21. > >> > >> I was going to look at pushing the XRender/DirectX backport upstream, but I think that > >> could do with more soak time in IcedTea6. We'll do that in b22. > >> > > That approach sounds sensible. > Ok, first webrev: http://cr.openjdk.java.net/~andrew/6668231/webrev.01/ 6668231: Presence of a critical subjectAltName causes JSSE's SunX509 to fail trusted checks Summary: make the critical extension known to end entity checker. Reviewed-by: wetmore, mullan Ok for push? The binary keystores are copied as-is from OpenJDK7. > Cheers, > > -Joe > > >> -- > >> Andrew :) > >> > >> Free Java Software Engineer > >> Red Hat, Inc. (http://www.redhat.com) > >> > >> Support Free Java! > >> Contribute to GNU Classpath and the OpenJDK > >> http://www.gnu.org/software/classpath > >> http://openjdk.java.net > >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > >> Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > >> > > > > Any thoughts on this, Joe? > > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From joe.darcy at oracle.com Tue Oct 26 17:15:04 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Tue, 26 Oct 2010 17:15:04 -0700 Subject: About time for b21? In-Reply-To: <20101026172303.GA29779@rivendell.middle-earth.co.uk> References: <4CB7A882.3080008@oracle.com> <20101018142812.GC31704@rivendell.middle-earth.co.uk> <20101021103205.GB5809@bree.redhat.com> <4CC2304B.6010709@oracle.com> <20101026172303.GA29779@rivendell.middle-earth.co.uk> Message-ID: <4CC76F08.4040509@oracle.com> Dr Andrew John Hughes wrote: > On 17:46 Fri 22 Oct , Joe Darcy wrote: > >> Dr Andrew John Hughes wrote: >> >>> On 15:28 Mon 18 Oct , Dr Andrew John Hughes wrote: >>> >>> >>>> On 18:04 Thu 14 Oct , Joe Darcy wrote: >>>> >>>> >>>>> Hello. >>>>> >>>>> With Andrew's sync of HS19 into OpenJDK 6 and the recent batch of >>>>> security fixes coming real soon now, I think it is about time to have >>>>> b21. I'd hold b21 for the remaining bug fixes pushed to HS19 that are >>>>> not quite promoted yet. >>>>> >>>>> Are there any other changes that should be in b21? >>>>> >>>>> -Joe >>>>> >>>>> >>>> http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-September/002008.html is >>>> still awaiting review. >>>> >>>> >> Ah, sorry for letting that fall through the cracks and for the belated >> reply -- reminder email just sent. >> >> > > Thanks. > There are some technical issues here I'm discussing with other members of the javac team. >>>> Two of the three suggestions on http://mail.openjdk.java.net/pipermail/jdk6-dev/2010-August/001954.html >>>> are also still pending (haven't had time to follow them up). >>>> >>>> 6678385 did go in, so 6853592 could do with also going in. See: >>>> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-October/010509.html >>>> 6853592: VM test nsk.regression.b4261880 fails with "X Error of failed request: BadWindow" inconsistently. >>>> >>>> >> 6853592 is approved to be backported in b21. >> >> > > Pushed. > Thanks. >>>> I'll post webrevs for these three if they sound ok for OpenJDK6 b21. >>>> >>>> I was going to look at pushing the XRender/DirectX backport upstream, but I think that >>>> could do with more soak time in IcedTea6. We'll do that in b22. >>>> >>>> >> That approach sounds sensible. >> >> > > Ok, first webrev: > > http://cr.openjdk.java.net/~andrew/6668231/webrev.01/ > > 6668231: Presence of a critical subjectAltName causes JSSE's SunX509 to fail trusted checks > Summary: make the critical extension known to end entity checker. > Reviewed-by: wetmore, mullan > > Ok for push? The binary keystores are copied as-is from OpenJDK7. > > I approve 6668231being backported subject to Andrew (Fan)'s verification it is fine for this release. Andrew (Fan), is there any issue with this fix going into OpenJDK 6? Thanks, -Joe From gbenson at redhat.com Wed Oct 27 01:43:57 2010 From: gbenson at redhat.com (Gary Benson) Date: Wed, 27 Oct 2010 09:43:57 +0100 Subject: About time for b21? In-Reply-To: <4CB7A882.3080008@oracle.com> References: <4CB7A882.3080008@oracle.com> Message-ID: <20101027084357.GA3450@redhat.com> Joe Darcy wrote: > Hello. > > With Andrew's sync of HS19 into OpenJDK 6 and the recent batch of > security fixes coming real soon now, I think it is about time to have > b21. I'd hold b21 for the remaining bug fixes pushed to HS19 that are > not quite promoted yet. > > Are there any other changes that should be in b21? Building HS19 with Zero on PowerPC requires a fix (6994130). There's a webrev (for JDK7, but it's the same) here: http://cr.openjdk.java.net/~gbenson/zero-ppc-fix/ Would it be possible to backport this? Cheers, Gary -- http://gbenson.net/ From joe.darcy at oracle.com Fri Oct 29 17:18:00 2010 From: joe.darcy at oracle.com (Joe Darcy) Date: Fri, 29 Oct 2010 17:18:00 -0700 Subject: About time for b21? In-Reply-To: <20101027084357.GA3450@redhat.com> References: <4CB7A882.3080008@oracle.com> <20101027084357.GA3450@redhat.com> Message-ID: <4CCB6438.3040108@oracle.com> Gary Benson wrote: > Joe Darcy wrote: > >> Hello. >> >> With Andrew's sync of HS19 into OpenJDK 6 and the recent batch of >> security fixes coming real soon now, I think it is about time to have >> b21. I'd hold b21 for the remaining bug fixes pushed to HS19 that are >> not quite promoted yet. >> >> Are there any other changes that should be in b21? >> > > Building HS19 with Zero on PowerPC requires a fix (6994130). > There's a webrev (for JDK7, but it's the same) here: > > http://cr.openjdk.java.net/~gbenson/zero-ppc-fix/ > > Would it be possible to backport this? > > Cheers, > Gary > > Hello. Once 6994130 is approved and integrated into JDK 7, I approve it being backported to OpenJDK 6. Thanks, -Joe