From ptisnovs at redhat.com  Tue Feb  1 06:31:37 2011
From: ptisnovs at redhat.com (Pavel Tisnovsky)
Date: Tue, 01 Feb 2011 15:31:37 +0100
Subject: [OpenJDK 2D-Dev] Reviewer needed - two new regression tests for
 checking PNG reader proper behaviour
Message-ID: <4D481949.9090003@redhat.com>

Hi all,

I've prepared two regression tests which check PNG reader behaviour.

First test (GoodPngImageProcessor) check if the ImageIO subsystem is
able to process various types of PNG images which are known to have
valid format.

Second test (BadPngImageProcessor) checks if the ImageIO subsystem
throws proper exception (ie. only exception mentioned in the
specification) if broken PNG image is to be read.

Webrev containing new tests is available at:
http://cr.openjdk.java.net/~ptisnovs/PngReader/

The test PNG images were obtained from the page
http://www.schaik.com/pngsuite/pngsuite.html with Willem van Schaik's
(author of all images)
approval:

=================================================================
The 'legal' status of PngSuite, if you can even call that, is that
anybody may use it any way they like. You may include it in any piece of
software, no matter if that's GPL, freeware or commercial.

When I created PngSuite at the time, I created every single image from
scratch. There was nothing used, borrowed, etc. from existing images. I
did it that way because nothing out there was usable, but the advantage
is that the end result has no depending copyright issues.
=================================================================

Is it possible to add files "licensed" in this way to OpneJKD7 please?

Thank you in advance
Pavel T.


From dlila at redhat.com  Tue Feb  1 18:16:39 2011
From: dlila at redhat.com (Denis Lila)
Date: Tue, 1 Feb 2011 21:16:39 -0500 (EST)
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <1188943781.666969.1296601449464.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
Message-ID: <411486699.678820.1296612999354.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>

Ah, I'm sorry. I forgot to CC the list.

----- Forwarded Message -----
From: "Denis Lila" <dlila at redhat.com>
To: "Jim Graham" <james.graham at oracle.com>
Sent: Tuesday, February 1, 2011 6:04:09 PM
Subject: Re: [OpenJDK 2D-Dev] CubicCurve2D.solveCubic and containment/intersection bugs.

Hi Jim.

The webrev for the performance improvement is here:
http://icedtea.classpath.org/~dlila/webrevs/perfWebrev/webrev/

I have changed a few things since the last time you looked at it.
The largest change is in Curve.java in breakPtsAtTs. I changed its return
from an Iterator<float[]> to an Iterator<Integer>, which allowed me to
change middle in Stroker from a float[2][8] to a float[16]. I also
eliminated the call to updateTs and the bouncing back and forth of the
subdivided curves in breakPtsAtTs.

The other major change is the implementation of the cubic solver in
Helpers.java (which is used in Dasher.LengthIterator). It's almost
identical to what I just commited to awt.geom.CubicCurve2D. I'm not
using the version in awt.geom because I want to avoid the array creations
but most importantly because we don't need anything even close to the
accuracy that CubicCurve2D provides. In fact, most of the time*,
LengthIterator's arguments to solveCubic are such that there is only
one solution, so I considered removing the 2 root case altogether just
to skip the within(D, 0, 1e-8) call (I haven't done this yet because
I wanted to check with you first).

* "most of the time" is a bit of an understatement. I've tested this with
tens of thousands of Dasher.curveTo calls, and I've never seen a case
where there is more than one root.

Regards,
Denis.

----- Original Message -----
> Actually, if you just want to type up a quick "description" I'll file
> the bug...
> 
> ...jim
> 
> On 1/27/2011 2:26 PM, Jim Graham wrote:
> > On 1/27/2011 2:03 PM, Denis Lila wrote:
> >> Well, it is pushed. Now all that's left on my end is the
> >> performance
> >> improvement for pisces (dashing in particular). Could you please
> >> file
> >> a performance regression bug for it?
> >
> > What are we regressing from? Is it slower than the previous OpenJDK
> > rasterizer?


From james.graham at oracle.com  Wed Feb  2 19:56:47 2011
From: james.graham at oracle.com (Jim Graham)
Date: Wed, 02 Feb 2011 19:56:47 -0800
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <411486699.678820.1296612999354.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
References: <411486699.678820.1296612999354.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
Message-ID: <4D4A277F.5000000@oracle.com>

Hi Denis,

Curve.java

line 242 - remove "both"

breakPtsAtTs - [whine]I sort of feel as if this method is trying to 
abstract something that is not really that bad to just do inline and in 
trying to apply the abstraction it might make the calling code slightly 
simpler, but it created a mess here by trying to shoehorn a natural 
inline process into an "Iterator" paradigm.  :-( [/whine]  Having said 
that, the new changes to this look good.  ;-)

Dasher.java

LengthIterator comment - any reason to delete it?  Too hard to keep it 
up to date?

line 342 - 0/0 == NaN which fails all tests, but should be considered to 
have low acceleration, no?  Also, what about the test:
	within(len1, len2, len2*err)
would that have similar properties?  The only advantage here is that 
multiplies are usually faster than divides.

line 385 - cache the "haveLowAccel" return value until the curve is 
redivided?

caching flatLeafCoef - If you add cache[3] and save the value to muliply 
by t (either -z or -y) then you wouldn't need to recalculate x,y,z every 
time:
     if (cache[2] < 0) {
         float x = ..., y = ...;
         if (type == 8) {
             float z = ...;
             cache[0..2] = ...;
             cache[3] = -z;
         } else {
             cache[0..2] = ...;
             cache[3] = -y;
         }
     }
     float a=...;
     float b=...;
     float c=...;
     float d=t*...;

Helpers.java

line 147 {}

PiscesRE.java

lines 286,288 - (dog whimpers) I noticed that the two lines you've 
modified are the only 2 lines in the comment that have apostrophes that 
my gnuemacs is allergic to.  Any chance you'd get rid of them for me?  ;-)

Renderer.java

line 80 - technically "ecur >= 0" would work as well and would probably 
be cheaper on most architectures if the condition codes are already set 
by the fetch - if not then comparing to 0 is usually cheaper than 
comparing to a number.  Though, I prefer using 0 as the terminator since 
it doesn't require an Arrays.fill() (though it does require biasing the 
stored indices by +1 so that they aren't null which may offset some of 
the array fill savings).

line 87 - should this be commented out at some point?

line 135 - "NEXT and OR" and "indices"

line 176 and 183-186 - does Math.scalb() go faster for these?

line 188 - it might look cleaner to just declare these inside the loop 
and add them from x0,y0 rather than +=.  I'm not sure if it will make a 
difference in performance, though, given the vagaries of FPU scheduling.

line 190 - what happened to the adjustment that used to be at line 359 
(i.e. dx,dy greater than INC_BND)?  Did it not save very many lines in 
the output?

line 286 - in my version I moved the calculation of slope up above here 
and just used the sign of the slope as the test for x ordering.  Note 
that if the slope calculations immediately precedes the "if (slope < 0)" 
test then the condition codes are likely already set as a side effect of 
the previous operation.  I also just put the "edgeMinMaxX" tests in the 
two halves of the "if" statement and avoided the need for the extra 
minX,maxX variables, though with a slight duplication of code.

line 442 - the code actually adds "2"

line 480 - interesting math trick which avoids a conditional:
     crorientation = ((curxo & 0x1) << 1) - 1;

			...jim

On 2/1/2011 6:16 PM, Denis Lila wrote:
> Ah, I'm sorry. I forgot to CC the list.
>
> ----- Forwarded Message -----
> From: "Denis Lila"<dlila at redhat.com>
> To: "Jim Graham"<james.graham at oracle.com>
> Sent: Tuesday, February 1, 2011 6:04:09 PM
> Subject: Re: [OpenJDK 2D-Dev] CubicCurve2D.solveCubic and containment/intersection bugs.
>
> Hi Jim.
>
> The webrev for the performance improvement is here:
> http://icedtea.classpath.org/~dlila/webrevs/perfWebrev/webrev/
>
> I have changed a few things since the last time you looked at it.
> The largest change is in Curve.java in breakPtsAtTs. I changed its return
> from an Iterator<float[]>  to an Iterator<Integer>, which allowed me to
> change middle in Stroker from a float[2][8] to a float[16]. I also
> eliminated the call to updateTs and the bouncing back and forth of the
> subdivided curves in breakPtsAtTs.
>
> The other major change is the implementation of the cubic solver in
> Helpers.java (which is used in Dasher.LengthIterator). It's almost
> identical to what I just commited to awt.geom.CubicCurve2D. I'm not
> using the version in awt.geom because I want to avoid the array creations
> but most importantly because we don't need anything even close to the
> accuracy that CubicCurve2D provides. In fact, most of the time*,
> LengthIterator's arguments to solveCubic are such that there is only
> one solution, so I considered removing the 2 root case altogether just
> to skip the within(D, 0, 1e-8) call (I haven't done this yet because
> I wanted to check with you first).
>
> * "most of the time" is a bit of an understatement. I've tested this with
> tens of thousands of Dasher.curveTo calls, and I've never seen a case
> where there is more than one root.
>
> Regards,
> Denis.
>
> ----- Original Message -----
>> Actually, if you just want to type up a quick "description" I'll file
>> the bug...
>>
>> ...jim
>>
>> On 1/27/2011 2:26 PM, Jim Graham wrote:
>>> On 1/27/2011 2:03 PM, Denis Lila wrote:
>>>> Well, it is pushed. Now all that's left on my end is the
>>>> performance
>>>> improvement for pisces (dashing in particular). Could you please
>>>> file
>>>> a performance regression bug for it?
>>>
>>> What are we regressing from? Is it slower than the previous OpenJDK
>>> rasterizer?


From james.graham at oracle.com  Wed Feb  2 20:11:09 2011
From: james.graham at oracle.com (Jim Graham)
Date: Wed, 02 Feb 2011 20:11:09 -0800
Subject: [OpenJDK 2D-Dev] CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <633591201.391956.1296165788940.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
References: <633591201.391956.1296165788940.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
Message-ID: <4D4A2ADD.5010204@oracle.com>

The bug for this is 7016856.  I just submitted it so it may take a few 
hours to show up on external lists...

			...jim

On 1/27/2011 2:03 PM, Denis Lila wrote:
> Well, it is pushed. Now all that's left on my end is the performance
> improvement for pisces (dashing in particular). Could you please file
> a performance regression bug for it?
>
> Thank you,
> Denis.


From dlila at redhat.com  Thu Feb  3 17:13:49 2011
From: dlila at redhat.com (Denis Lila)
Date: Thu, 3 Feb 2011 20:13:49 -0500 (EST)
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <4D4A277F.5000000@oracle.com>
Message-ID: <1805906117.65735.1296782029686.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>

Hi Jim.

> breakPtsAtTs - [whine]I sort of feel as if this method is trying to
> abstract something that is not really that bad to just do inline and
> in
> trying to apply the abstraction it might make the calling code
> slightly
> simpler, but it created a mess here by trying to shoehorn a natural
> inline process into an "Iterator" paradigm. :-( [/whine] Having said
> that, the new changes to this look good. ;-)

I agree that the complexity of the abstraction is higher than what it saves
in the calling code (but I also think it makes the calling code more than
slightly simpler since it saves us one or two local variables in the caller).
The reason I wrote this method was because I was hoping to perhaps use it in
Dasher too (like I describe in the TODO), and I think I was using it in some
other place at the time. Now the only calling function is in Stroker, so I
could inline it if you want, but I'm not too eager to do that, because what
we have works, and we wouldn't gain much from inlining.

> LengthIterator comment - any reason to delete it? Too hard to keep it
> up to date?

I reintroduced it. I don't even remember deleting it, or why I did so :/

> line 342 - 0/0 == NaN which fails all tests, but should be considered
> to
> have low acceleration, no? Also, what about the test:
> within(len1, len2, len2*err)
> would that have similar properties? The only advantage here is that
> multiplies are usually faster than divides.

They are equivalent. I'm using your version now. This also fixes the 0/0
problem.

> line 176 and 183-186 - does Math.scalb() go faster for these?

scalb is slightly slower on my machine (by about 5%).

> line 190 - what happened to the adjustment that used to be at line 359
> (i.e. dx,dy greater than INC_BND)? Did it not save very many lines in
> the output?

I eliminated it because of how the dx and ddx values change for quadratic
curves. I don't remember exactly what was going on, but one of them stays
constant so every test had the same outcome and was therefore a waste.
A better explanation can be found in ProcesPath.c (which is one of the
palces from where I got the algorithm).

> line 80 - technically "ecur >= 0" would work as well and would
> probably
> be cheaper on most architectures if the condition codes are already
> set
> by the fetch - if not then comparing to 0 is usually cheaper than
> comparing to a number. Though, I prefer using 0 as the terminator
> since
> it doesn't require an Arrays.fill() (though it does require biasing
> the
> stored indices by +1 so that they aren't null which may offset some of
> the array fill savings).

I didn't implement this because of your last point. I could, if you
think the benefits would definitely be worth it.

I've implemented all your other suggestions.

Thank you,
Denis.

----- Original Message -----
> Hi Denis,
> 
> Curve.java
> 
> line 242 - remove "both"
> 

> 
> Dasher.java
> 
> 

> 
> line 385 - cache the "haveLowAccel" return value until the curve is
> redivided?
> 
> caching flatLeafCoef - If you add cache[3] and save the value to
> muliply
> by t (either -z or -y) then you wouldn't need to recalculate x,y,z
> every
> time:
> if (cache[2] < 0) {
> float x = ..., y = ...;
> if (type == 8) {
> float z = ...;
> cache[0..2] = ...;
> cache[3] = -z;
> } else {
> cache[0..2] = ...;
> cache[3] = -y;
> }
> }
> float a=...;
> float b=...;
> float c=...;
> float d=t*...;
> 
> Helpers.java
> 
> line 147 {}
> 
> PiscesRE.java
> 
> lines 286,288 - (dog whimpers) I noticed that the two lines you've
> modified are the only 2 lines in the comment that have apostrophes
> that
> my gnuemacs is allergic to. Any chance you'd get rid of them for me?
> ;-)
> 
> Renderer.java
> 

> 
> line 87 - should this be commented out at some point?
> 
> line 135 - "NEXT and OR" and "indices"
> 

> 
> line 188 - it might look cleaner to just declare these inside the loop
> and add them from x0,y0 rather than +=. I'm not sure if it will make a
> difference in performance, though, given the vagaries of FPU
> scheduling.
> 

> 
> line 286 - in my version I moved the calculation of slope up above
> here
> and just used the sign of the slope as the test for x ordering. Note
> that if the slope calculations immediately precedes the "if (slope <
> 0)"
> test then the condition codes are likely already set as a side effect
> of
> the previous operation. I also just put the "edgeMinMaxX" tests in the
> two halves of the "if" statement and avoided the need for the extra
> minX,maxX variables, though with a slight duplication of code.
> 
> line 442 - the code actually adds "2"
> 
> line 480 - interesting math trick which avoids a conditional:
> crorientation = ((curxo & 0x1) << 1) - 1;
> 
> ...jim
> 
> On 2/1/2011 6:16 PM, Denis Lila wrote:
> > Ah, I'm sorry. I forgot to CC the list.
> >
> > ----- Forwarded Message -----
> > From: "Denis Lila"<dlila at redhat.com>
> > To: "Jim Graham"<james.graham at oracle.com>
> > Sent: Tuesday, February 1, 2011 6:04:09 PM
> > Subject: Re: [OpenJDK 2D-Dev] CubicCurve2D.solveCubic and
> > containment/intersection bugs.
> >
> > Hi Jim.
> >
> > The webrev for the performance improvement is here:
> > http://icedtea.classpath.org/~dlila/webrevs/perfWebrev/webrev/
> >
> > I have changed a few things since the last time you looked at it.
> > The largest change is in Curve.java in breakPtsAtTs. I changed its
> > return
> > from an Iterator<float[]> to an Iterator<Integer>, which allowed me
> > to
> > change middle in Stroker from a float[2][8] to a float[16]. I also
> > eliminated the call to updateTs and the bouncing back and forth of
> > the
> > subdivided curves in breakPtsAtTs.
> >
> > The other major change is the implementation of the cubic solver in
> > Helpers.java (which is used in Dasher.LengthIterator). It's almost
> > identical to what I just commited to awt.geom.CubicCurve2D. I'm not
> > using the version in awt.geom because I want to avoid the array
> > creations
> > but most importantly because we don't need anything even close to
> > the
> > accuracy that CubicCurve2D provides. In fact, most of the time*,
> > LengthIterator's arguments to solveCubic are such that there is only
> > one solution, so I considered removing the 2 root case altogether
> > just
> > to skip the within(D, 0, 1e-8) call (I haven't done this yet because
> > I wanted to check with you first).
> >
> > * "most of the time" is a bit of an understatement. I've tested this
> > with
> > tens of thousands of Dasher.curveTo calls, and I've never seen a
> > case
> > where there is more than one root.
> >
> > Regards,
> > Denis.
> >
> > ----- Original Message -----
> >> Actually, if you just want to type up a quick "description" I'll
> >> file
> >> the bug...
> >>
> >> ...jim
> >>
> >> On 1/27/2011 2:26 PM, Jim Graham wrote:
> >>> On 1/27/2011 2:03 PM, Denis Lila wrote:
> >>>> Well, it is pushed. Now all that's left on my end is the
> >>>> performance
> >>>> improvement for pisces (dashing in particular). Could you please
> >>>> file
> >>>> a performance regression bug for it?
> >>>
> >>> What are we regressing from? Is it slower than the previous
> >>> OpenJDK
> >>> rasterizer?


From james.graham at oracle.com  Thu Feb  3 17:48:23 2011
From: james.graham at oracle.com (Jim Graham)
Date: Thu, 03 Feb 2011 17:48:23 -0800
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <1805906117.65735.1296782029686.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
References: <1805906117.65735.1296782029686.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
Message-ID: <4D4B5AE7.7010602@oracle.com>

Thanks Denis,

The code changes look good to go.  As for regression test...

I'm guessing there is no regression test for this as it is entirely 
performance.  If this fixes any quality or correctness bugs it would be 
nice to develop an automated test case to go back with it, but if it is 
just performance then they don't usually have tests...

			...jim

On 2/3/2011 5:13 PM, Denis Lila wrote:
> Hi Jim.
>
>> breakPtsAtTs - [whine]I sort of feel as if this method is trying to
>> abstract something that is not really that bad to just do inline and
>> in
>> trying to apply the abstraction it might make the calling code
>> slightly
>> simpler, but it created a mess here by trying to shoehorn a natural
>> inline process into an "Iterator" paradigm. :-( [/whine] Having said
>> that, the new changes to this look good. ;-)
>
> I agree that the complexity of the abstraction is higher than what it saves
> in the calling code (but I also think it makes the calling code more than
> slightly simpler since it saves us one or two local variables in the caller).
> The reason I wrote this method was because I was hoping to perhaps use it in
> Dasher too (like I describe in the TODO), and I think I was using it in some
> other place at the time. Now the only calling function is in Stroker, so I
> could inline it if you want, but I'm not too eager to do that, because what
> we have works, and we wouldn't gain much from inlining.
>
>> LengthIterator comment - any reason to delete it? Too hard to keep it
>> up to date?
>
> I reintroduced it. I don't even remember deleting it, or why I did so :/
>
>> line 342 - 0/0 == NaN which fails all tests, but should be considered
>> to
>> have low acceleration, no? Also, what about the test:
>> within(len1, len2, len2*err)
>> would that have similar properties? The only advantage here is that
>> multiplies are usually faster than divides.
>
> They are equivalent. I'm using your version now. This also fixes the 0/0
> problem.
>
>> line 176 and 183-186 - does Math.scalb() go faster for these?
>
> scalb is slightly slower on my machine (by about 5%).
>
>> line 190 - what happened to the adjustment that used to be at line 359
>> (i.e. dx,dy greater than INC_BND)? Did it not save very many lines in
>> the output?
>
> I eliminated it because of how the dx and ddx values change for quadratic
> curves. I don't remember exactly what was going on, but one of them stays
> constant so every test had the same outcome and was therefore a waste.
> A better explanation can be found in ProcesPath.c (which is one of the
> palces from where I got the algorithm).
>
>> line 80 - technically "ecur>= 0" would work as well and would
>> probably
>> be cheaper on most architectures if the condition codes are already
>> set
>> by the fetch - if not then comparing to 0 is usually cheaper than
>> comparing to a number. Though, I prefer using 0 as the terminator
>> since
>> it doesn't require an Arrays.fill() (though it does require biasing
>> the
>> stored indices by +1 so that they aren't null which may offset some of
>> the array fill savings).
>
> I didn't implement this because of your last point. I could, if you
> think the benefits would definitely be worth it.
>
> I've implemented all your other suggestions.
>
> Thank you,
> Denis.
>
> ----- Original Message -----
>> Hi Denis,
>>
>> Curve.java
>>
>> line 242 - remove "both"
>>
>
>>
>> Dasher.java
>>
>>
>
>>
>> line 385 - cache the "haveLowAccel" return value until the curve is
>> redivided?
>>
>> caching flatLeafCoef - If you add cache[3] and save the value to
>> muliply
>> by t (either -z or -y) then you wouldn't need to recalculate x,y,z
>> every
>> time:
>> if (cache[2]<  0) {
>> float x = ..., y = ...;
>> if (type == 8) {
>> float z = ...;
>> cache[0..2] = ...;
>> cache[3] = -z;
>> } else {
>> cache[0..2] = ...;
>> cache[3] = -y;
>> }
>> }
>> float a=...;
>> float b=...;
>> float c=...;
>> float d=t*...;
>>
>> Helpers.java
>>
>> line 147 {}
>>
>> PiscesRE.java
>>
>> lines 286,288 - (dog whimpers) I noticed that the two lines you've
>> modified are the only 2 lines in the comment that have apostrophes
>> that
>> my gnuemacs is allergic to. Any chance you'd get rid of them for me?
>> ;-)
>>
>> Renderer.java
>>
>
>>
>> line 87 - should this be commented out at some point?
>>
>> line 135 - "NEXT and OR" and "indices"
>>
>
>>
>> line 188 - it might look cleaner to just declare these inside the loop
>> and add them from x0,y0 rather than +=. I'm not sure if it will make a
>> difference in performance, though, given the vagaries of FPU
>> scheduling.
>>
>
>>
>> line 286 - in my version I moved the calculation of slope up above
>> here
>> and just used the sign of the slope as the test for x ordering. Note
>> that if the slope calculations immediately precedes the "if (slope<
>> 0)"
>> test then the condition codes are likely already set as a side effect
>> of
>> the previous operation. I also just put the "edgeMinMaxX" tests in the
>> two halves of the "if" statement and avoided the need for the extra
>> minX,maxX variables, though with a slight duplication of code.
>>
>> line 442 - the code actually adds "2"
>>
>> line 480 - interesting math trick which avoids a conditional:
>> crorientation = ((curxo&  0x1)<<  1) - 1;
>>
>> ...jim
>>
>> On 2/1/2011 6:16 PM, Denis Lila wrote:
>>> Ah, I'm sorry. I forgot to CC the list.
>>>
>>> ----- Forwarded Message -----
>>> From: "Denis Lila"<dlila at redhat.com>
>>> To: "Jim Graham"<james.graham at oracle.com>
>>> Sent: Tuesday, February 1, 2011 6:04:09 PM
>>> Subject: Re: [OpenJDK 2D-Dev] CubicCurve2D.solveCubic and
>>> containment/intersection bugs.
>>>
>>> Hi Jim.
>>>
>>> The webrev for the performance improvement is here:
>>> http://icedtea.classpath.org/~dlila/webrevs/perfWebrev/webrev/
>>>
>>> I have changed a few things since the last time you looked at it.
>>> The largest change is in Curve.java in breakPtsAtTs. I changed its
>>> return
>>> from an Iterator<float[]>  to an Iterator<Integer>, which allowed me
>>> to
>>> change middle in Stroker from a float[2][8] to a float[16]. I also
>>> eliminated the call to updateTs and the bouncing back and forth of
>>> the
>>> subdivided curves in breakPtsAtTs.
>>>
>>> The other major change is the implementation of the cubic solver in
>>> Helpers.java (which is used in Dasher.LengthIterator). It's almost
>>> identical to what I just commited to awt.geom.CubicCurve2D. I'm not
>>> using the version in awt.geom because I want to avoid the array
>>> creations
>>> but most importantly because we don't need anything even close to
>>> the
>>> accuracy that CubicCurve2D provides. In fact, most of the time*,
>>> LengthIterator's arguments to solveCubic are such that there is only
>>> one solution, so I considered removing the 2 root case altogether
>>> just
>>> to skip the within(D, 0, 1e-8) call (I haven't done this yet because
>>> I wanted to check with you first).
>>>
>>> * "most of the time" is a bit of an understatement. I've tested this
>>> with
>>> tens of thousands of Dasher.curveTo calls, and I've never seen a
>>> case
>>> where there is more than one root.
>>>
>>> Regards,
>>> Denis.
>>>
>>> ----- Original Message -----
>>>> Actually, if you just want to type up a quick "description" I'll
>>>> file
>>>> the bug...
>>>>
>>>> ...jim
>>>>
>>>> On 1/27/2011 2:26 PM, Jim Graham wrote:
>>>>> On 1/27/2011 2:03 PM, Denis Lila wrote:
>>>>>> Well, it is pushed. Now all that's left on my end is the
>>>>>> performance
>>>>>> improvement for pisces (dashing in particular). Could you please
>>>>>> file
>>>>>> a performance regression bug for it?
>>>>>
>>>>> What are we regressing from? Is it slower than the previous
>>>>> OpenJDK
>>>>> rasterizer?


From dlila at redhat.com  Thu Feb  3 17:59:39 2011
From: dlila at redhat.com (Denis Lila)
Date: Thu, 3 Feb 2011 20:59:39 -0500 (EST)
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <4D4B5AE7.7010602@oracle.com>
Message-ID: <585786422.70312.1296784779848.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>

Hi Jim.

> The code changes look good to go.

Nice! Thanks.

> I'm guessing there is no regression test for this as it is entirely
> performance. If this fixes any quality or correctness bugs it would be
> nice to develop an automated test case to go back with it, but if it
> is
> just performance then they don't usually have tests...

This changeset would be entirely performance and I don't have a test
for it. I do however have a few regression tests that I would like to
push. They're already in icedtea:
http://icedtea.classpath.org/hg/icedtea6/file/12df222ab029/patches/rendering-engine-tests.patch
One of them doesn't have a sun bugid, so we should probably just skip it.
I'm not sure how we would include them, since they all test bugs that
have already been fixed.

Regards,
Denis.


----- Original Message -----
> Thanks Denis,
> 

> 

> 
> ...jim
> 
> On 2/3/2011 5:13 PM, Denis Lila wrote:
> > Hi Jim.
> >
> >> breakPtsAtTs - [whine]I sort of feel as if this method is trying to
> >> abstract something that is not really that bad to just do inline
> >> and
> >> in
> >> trying to apply the abstraction it might make the calling code
> >> slightly
> >> simpler, but it created a mess here by trying to shoehorn a natural
> >> inline process into an "Iterator" paradigm. :-( [/whine] Having
> >> said
> >> that, the new changes to this look good. ;-)
> >
> > I agree that the complexity of the abstraction is higher than what
> > it saves
> > in the calling code (but I also think it makes the calling code more
> > than
> > slightly simpler since it saves us one or two local variables in the
> > caller).
> > The reason I wrote this method was because I was hoping to perhaps
> > use it in
> > Dasher too (like I describe in the TODO), and I think I was using it
> > in some
> > other place at the time. Now the only calling function is in
> > Stroker, so I
> > could inline it if you want, but I'm not too eager to do that,
> > because what
> > we have works, and we wouldn't gain much from inlining.
> >
> >> LengthIterator comment - any reason to delete it? Too hard to keep
> >> it
> >> up to date?
> >
> > I reintroduced it. I don't even remember deleting it, or why I did
> > so :/
> >
> >> line 342 - 0/0 == NaN which fails all tests, but should be
> >> considered
> >> to
> >> have low acceleration, no? Also, what about the test:
> >> within(len1, len2, len2*err)
> >> would that have similar properties? The only advantage here is that
> >> multiplies are usually faster than divides.
> >
> > They are equivalent. I'm using your version now. This also fixes the
> > 0/0
> > problem.
> >
> >> line 176 and 183-186 - does Math.scalb() go faster for these?
> >
> > scalb is slightly slower on my machine (by about 5%).
> >
> >> line 190 - what happened to the adjustment that used to be at line
> >> 359
> >> (i.e. dx,dy greater than INC_BND)? Did it not save very many lines
> >> in
> >> the output?
> >
> > I eliminated it because of how the dx and ddx values change for
> > quadratic
> > curves. I don't remember exactly what was going on, but one of them
> > stays
> > constant so every test had the same outcome and was therefore a
> > waste.
> > A better explanation can be found in ProcesPath.c (which is one of
> > the
> > palces from where I got the algorithm).
> >
> >> line 80 - technically "ecur>= 0" would work as well and would
> >> probably
> >> be cheaper on most architectures if the condition codes are already
> >> set
> >> by the fetch - if not then comparing to 0 is usually cheaper than
> >> comparing to a number. Though, I prefer using 0 as the terminator
> >> since
> >> it doesn't require an Arrays.fill() (though it does require biasing
> >> the
> >> stored indices by +1 so that they aren't null which may offset some
> >> of
> >> the array fill savings).
> >
> > I didn't implement this because of your last point. I could, if you
> > think the benefits would definitely be worth it.
> >
> > I've implemented all your other suggestions.
> >
> > Thank you,
> > Denis.
> >
> > ----- Original Message -----
> >> Hi Denis,
> >>
> >> Curve.java
> >>
> >> line 242 - remove "both"
> >>
> >
> >>
> >> Dasher.java
> >>
> >>
> >
> >>
> >> line 385 - cache the "haveLowAccel" return value until the curve is
> >> redivided?
> >>
> >> caching flatLeafCoef - If you add cache[3] and save the value to
> >> muliply
> >> by t (either -z or -y) then you wouldn't need to recalculate x,y,z
> >> every
> >> time:
> >> if (cache[2]< 0) {
> >> float x = ..., y = ...;
> >> if (type == 8) {
> >> float z = ...;
> >> cache[0..2] = ...;
> >> cache[3] = -z;
> >> } else {
> >> cache[0..2] = ...;
> >> cache[3] = -y;
> >> }
> >> }
> >> float a=...;
> >> float b=...;
> >> float c=...;
> >> float d=t*...;
> >>
> >> Helpers.java
> >>
> >> line 147 {}
> >>
> >> PiscesRE.java
> >>
> >> lines 286,288 - (dog whimpers) I noticed that the two lines you've
> >> modified are the only 2 lines in the comment that have apostrophes
> >> that
> >> my gnuemacs is allergic to. Any chance you'd get rid of them for
> >> me?
> >> ;-)
> >>
> >> Renderer.java
> >>
> >
> >>
> >> line 87 - should this be commented out at some point?
> >>
> >> line 135 - "NEXT and OR" and "indices"
> >>
> >
> >>
> >> line 188 - it might look cleaner to just declare these inside the
> >> loop
> >> and add them from x0,y0 rather than +=. I'm not sure if it will
> >> make a
> >> difference in performance, though, given the vagaries of FPU
> >> scheduling.
> >>
> >
> >>
> >> line 286 - in my version I moved the calculation of slope up above
> >> here
> >> and just used the sign of the slope as the test for x ordering.
> >> Note
> >> that if the slope calculations immediately precedes the "if (slope<
> >> 0)"
> >> test then the condition codes are likely already set as a side
> >> effect
> >> of
> >> the previous operation. I also just put the "edgeMinMaxX" tests in
> >> the
> >> two halves of the "if" statement and avoided the need for the extra
> >> minX,maxX variables, though with a slight duplication of code.
> >>
> >> line 442 - the code actually adds "2"
> >>
> >> line 480 - interesting math trick which avoids a conditional:
> >> crorientation = ((curxo& 0x1)<< 1) - 1;
> >>
> >> ...jim
> >>
> >> On 2/1/2011 6:16 PM, Denis Lila wrote:
> >>> Ah, I'm sorry. I forgot to CC the list.
> >>>
> >>> ----- Forwarded Message -----
> >>> From: "Denis Lila"<dlila at redhat.com>
> >>> To: "Jim Graham"<james.graham at oracle.com>
> >>> Sent: Tuesday, February 1, 2011 6:04:09 PM
> >>> Subject: Re: [OpenJDK 2D-Dev] CubicCurve2D.solveCubic and
> >>> containment/intersection bugs.
> >>>
> >>> Hi Jim.
> >>>
> >>> The webrev for the performance improvement is here:
> >>> http://icedtea.classpath.org/~dlila/webrevs/perfWebrev/webrev/
> >>>
> >>> I have changed a few things since the last time you looked at it.
> >>> The largest change is in Curve.java in breakPtsAtTs. I changed its
> >>> return
> >>> from an Iterator<float[]> to an Iterator<Integer>, which allowed
> >>> me
> >>> to
> >>> change middle in Stroker from a float[2][8] to a float[16]. I also
> >>> eliminated the call to updateTs and the bouncing back and forth of
> >>> the
> >>> subdivided curves in breakPtsAtTs.
> >>>
> >>> The other major change is the implementation of the cubic solver
> >>> in
> >>> Helpers.java (which is used in Dasher.LengthIterator). It's almost
> >>> identical to what I just commited to awt.geom.CubicCurve2D. I'm
> >>> not
> >>> using the version in awt.geom because I want to avoid the array
> >>> creations
> >>> but most importantly because we don't need anything even close to
> >>> the
> >>> accuracy that CubicCurve2D provides. In fact, most of the time*,
> >>> LengthIterator's arguments to solveCubic are such that there is
> >>> only
> >>> one solution, so I considered removing the 2 root case altogether
> >>> just
> >>> to skip the within(D, 0, 1e-8) call (I haven't done this yet
> >>> because
> >>> I wanted to check with you first).
> >>>
> >>> * "most of the time" is a bit of an understatement. I've tested
> >>> this
> >>> with
> >>> tens of thousands of Dasher.curveTo calls, and I've never seen a
> >>> case
> >>> where there is more than one root.
> >>>
> >>> Regards,
> >>> Denis.
> >>>
> >>> ----- Original Message -----
> >>>> Actually, if you just want to type up a quick "description" I'll
> >>>> file
> >>>> the bug...
> >>>>
> >>>> ...jim
> >>>>
> >>>> On 1/27/2011 2:26 PM, Jim Graham wrote:
> >>>>> On 1/27/2011 2:03 PM, Denis Lila wrote:
> >>>>>> Well, it is pushed. Now all that's left on my end is the
> >>>>>> performance
> >>>>>> improvement for pisces (dashing in particular). Could you
> >>>>>> please
> >>>>>> file
> >>>>>> a performance regression bug for it?
> >>>>>
> >>>>> What are we regressing from? Is it slower than the previous
> >>>>> OpenJDK
> >>>>> rasterizer?


From james.graham at oracle.com  Thu Feb  3 18:46:03 2011
From: james.graham at oracle.com (Jim Graham)
Date: Thu, 03 Feb 2011 18:46:03 -0800
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <585786422.70312.1296784779848.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
References: <585786422.70312.1296784779848.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
Message-ID: <4D4B686B.1040807@oracle.com>

Do these also pass closed JDK?  So far I don't know of any way to 
identify a test as "Open Rasterizer only"...

			...jim

On 2/3/2011 5:59 PM, Denis Lila wrote:
> Hi Jim.
>
>> The code changes look good to go.
>
> Nice! Thanks.
>
>> I'm guessing there is no regression test for this as it is entirely
>> performance. If this fixes any quality or correctness bugs it would be
>> nice to develop an automated test case to go back with it, but if it
>> is
>> just performance then they don't usually have tests...
>
> This changeset would be entirely performance and I don't have a test
> for it. I do however have a few regression tests that I would like to
> push. They're already in icedtea:
> http://icedtea.classpath.org/hg/icedtea6/file/12df222ab029/patches/rendering-engine-tests.patch
> One of them doesn't have a sun bugid, so we should probably just skip it.
> I'm not sure how we would include them, since they all test bugs that
> have already been fixed.
>
> Regards,
> Denis.


From dlila at redhat.com  Fri Feb  4 06:02:59 2011
From: dlila at redhat.com (Denis Lila)
Date: Fri, 4 Feb 2011 09:02:59 -0500 (EST)
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <4D4B686B.1040807@oracle.com>
Message-ID: <425997780.97538.1296828179620.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>

> Do these also pass closed JDK? So far I don't know of any way to
> identify a test as "Open Rasterizer only"...

I don't think so. When I run it with closed source java it
complains about no PathConsumer2D.

----- Original Message -----

> 
> ...jim
> 
> On 2/3/2011 5:59 PM, Denis Lila wrote:
> > Hi Jim.
> >
> >> The code changes look good to go.
> >
> > Nice! Thanks.
> >
> >> I'm guessing there is no regression test for this as it is entirely
> >> performance. If this fixes any quality or correctness bugs it would
> >> be
> >> nice to develop an automated test case to go back with it, but if
> >> it
> >> is
> >> just performance then they don't usually have tests...
> >
> > This changeset would be entirely performance and I don't have a test
> > for it. I do however have a few regression tests that I would like
> > to
> > push. They're already in icedtea:
> > http://icedtea.classpath.org/hg/icedtea6/file/12df222ab029/patches/rendering-engine-tests.patch
> > One of them doesn't have a sun bugid, so we should probably just
> > skip it.
> > I'm not sure how we would include them, since they all test bugs
> > that
> > have already been fixed.
> >
> > Regards,
> > Denis.


From james.graham at oracle.com  Fri Feb  4 12:13:53 2011
From: james.graham at oracle.com (Jim Graham)
Date: Fri, 04 Feb 2011 12:13:53 -0800
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <425997780.97538.1296828179620.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
References: <425997780.97538.1296828179620.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
Message-ID: <4D4C5E01.5050908@oracle.com>

Then that would be a problem.  We'll have to figure out how to make them 
fail benignly if not run on a specific build (i.e. don't use internal 
rendering APIs).  I'd hold off on putting these back for now...

			...jim

On 2/4/2011 6:02 AM, Denis Lila wrote:
>> Do these also pass closed JDK? So far I don't know of any way to
>> identify a test as "Open Rasterizer only"...
>
> I don't think so. When I run it with closed source java it
> complains about no PathConsumer2D.
>
> ----- Original Message -----
>
>>
>> ...jim
>>
>> On 2/3/2011 5:59 PM, Denis Lila wrote:
>>> Hi Jim.
>>>
>>>> The code changes look good to go.
>>>
>>> Nice! Thanks.
>>>
>>>> I'm guessing there is no regression test for this as it is entirely
>>>> performance. If this fixes any quality or correctness bugs it would
>>>> be
>>>> nice to develop an automated test case to go back with it, but if
>>>> it
>>>> is
>>>> just performance then they don't usually have tests...
>>>
>>> This changeset would be entirely performance and I don't have a test
>>> for it. I do however have a few regression tests that I would like
>>> to
>>> push. They're already in icedtea:
>>> http://icedtea.classpath.org/hg/icedtea6/file/12df222ab029/patches/rendering-engine-tests.patch
>>> One of them doesn't have a sun bugid, so we should probably just
>>> skip it.
>>> I'm not sure how we would include them, since they all test bugs
>>> that
>>> have already been fixed.
>>>
>>> Regards,
>>> Denis.


From lana.steuck at oracle.com  Fri Feb  4 16:55:25 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Sat, 05 Feb 2011 00:55:25 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d: 13 new changesets
Message-ID: <20110205005526.1479A47427@hg.openjdk.java.net>

Changeset: bd70f76b0309
Author:    cl
Date:      2011-01-20 15:51 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/bd70f76b0309

Added tag jdk7-b126 for changeset b566d4909056

! .hgtags

Changeset: 6e0f4d6099bb
Author:    cl
Date:      2011-01-27 17:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/6e0f4d6099bb

Added tag jdk7-b127 for changeset bd70f76b0309

! .hgtags

Changeset: f722c246ce71
Author:    mchung
Date:      2011-01-20 22:16 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/f722c246ce71

7013739: jdk_rmi target is missing in the top repo's test/Makefile
Reviewed-by: ohair, igor

! test/Makefile

Changeset: 65e6601596e2
Author:    lana
Date:      2011-01-24 13:21 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/65e6601596e2

Merge


Changeset: 61f181d43d9a
Author:    lana
Date:      2011-01-28 10:00 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/61f181d43d9a

Merge


Changeset: 6db0e6f221bd
Author:    ohair
Date:      2011-01-05 17:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/6db0e6f221bd

7009969: Remove SKIP_OPENJDK_BUILD from top Makefile
Reviewed-by: robilad

! Makefile
! make/Defs-internal.gmk

Changeset: 49c463695059
Author:    ohair
Date:      2011-01-10 10:00 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/49c463695059

Merge


Changeset: 6d9bbcc0a8cb
Author:    ohair
Date:      2011-01-13 17:55 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/6d9bbcc0a8cb

Merge


Changeset: 24900a58ab9f
Author:    ohair
Date:      2011-01-14 14:04 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/24900a58ab9f

6950375: Remove msvcrt.dll from the Windows JRE bundles
Reviewed-by: prr

! Makefile
! README-builds.html

Changeset: 3a9f19cbf7f1
Author:    ohair
Date:      2011-01-26 16:05 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/3a9f19cbf7f1

Merge


Changeset: a7a4f6db294d
Author:    ohair
Date:      2011-01-27 18:43 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/a7a4f6db294d

Merge


Changeset: 57d702105b23
Author:    ohair
Date:      2011-02-02 09:38 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/57d702105b23

Merge


Changeset: 904d7c7c44d9
Author:    cl
Date:      2011-02-03 17:22 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/904d7c7c44d9

Added tag jdk7-b128 for changeset 57d702105b23

! .hgtags



From lana.steuck at oracle.com  Fri Feb  4 16:55:31 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Sat, 05 Feb 2011 00:55:31 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/corba: 3 new changesets
Message-ID: <20110205005533.7D53647428@hg.openjdk.java.net>

Changeset: 64775e83f4df
Author:    cl
Date:      2011-01-20 15:52 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/corba/rev/64775e83f4df

Added tag jdk7-b126 for changeset d7532bcd3742

! .hgtags

Changeset: 9baa8f94a11d
Author:    cl
Date:      2011-01-27 17:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/corba/rev/9baa8f94a11d

Added tag jdk7-b127 for changeset 64775e83f4df

! .hgtags

Changeset: 3ff9acc7cc06
Author:    cl
Date:      2011-02-03 17:22 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/corba/rev/3ff9acc7cc06

Added tag jdk7-b128 for changeset 9baa8f94a11d

! .hgtags



From lana.steuck at oracle.com  Fri Feb  4 16:59:07 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Sat, 05 Feb 2011 00:59:07 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/hotspot: 52 new changesets
Message-ID: <20110205010040.5F3C547429@hg.openjdk.java.net>

Changeset: 102466e70deb
Author:    cl
Date:      2011-01-20 15:52 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/102466e70deb

Added tag jdk7-b126 for changeset 4c851c931d00

! .hgtags

Changeset: 907c1aed0f8c
Author:    cl
Date:      2011-01-27 17:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/907c1aed0f8c

Added tag jdk7-b127 for changeset 102466e70deb

! .hgtags

Changeset: e4f8c88cf6f0
Author:    trims
Date:      2011-01-13 22:49 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/e4f8c88cf6f0

Added tag hs20-b06 for changeset e24ab3fa6aaf

! .hgtags

Changeset: 76d6282dcfe5
Author:    trims
Date:      2011-01-13 22:53 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/76d6282dcfe5

7012348: Bump the HS20 build number to 07
Summary: Update the HS20 build number to 07
Reviewed-by: jcoomes

! make/hotspot_version

Changeset: 55f868e91c3b
Author:    iveresov
Date:      2011-01-06 16:03 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/55f868e91c3b

7010618: C1: array length should be treated at int on 64bit during array allocation
Summary: Sign-extend the length argument during array allocation
Reviewed-by: never, kvn

! src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
! src/cpu/x86/vm/c1_LIRAssembler_x86.cpp

Changeset: 0e52ef6e94d3
Author:    twisti
Date:      2011-01-07 03:58 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/0e52ef6e94d3

Merge


Changeset: 4fc084dac61e
Author:    kvn
Date:      2011-01-07 10:16 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/4fc084dac61e

7009756: volatile variables could be broken throw reflection API
Summary: Use Atomic::load() and Atomic::store() to access a volatile long.
Reviewed-by: iveresov, jrose, dholmes, never

! src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp
! src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp
! src/os_cpu/linux_x86/vm/linux_x86_32.s
! src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp
! src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp
! src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp
! src/os_cpu/solaris_x86/vm/solaris_x86_32.il
! src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp
! src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp
! src/share/vm/prims/unsafe.cpp

Changeset: 78e248949382
Author:    kvn
Date:      2011-01-07 11:53 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/78e248949382

6876037: CTW fails jdk7/hotspot/src/share/vm/opto/type.cpp:2055. assert(bits,"Use TypePtr for NULL")
Summary: Add missing 0 value check in TypeRawPtr::add_offset().
Reviewed-by: never

! src/share/vm/opto/type.cpp

Changeset: d810e9a3fc33
Author:    twisti
Date:      2011-01-10 00:56 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/d810e9a3fc33

7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) failed: init'd to NULL
Reviewed-by: never

! src/cpu/sparc/vm/methodHandles_sparc.cpp
! src/cpu/x86/vm/methodHandles_x86.cpp
! src/share/vm/prims/methodHandles.cpp
! src/share/vm/prims/methodHandles.hpp

Changeset: 70427f06ea47
Author:    twisti
Date:      2011-01-10 03:58 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/70427f06ea47

7010913: JSR 292 ciMethodHandle does not handle MethodHandleCompiler exceptions properly
Reviewed-by: kvn, never

! src/share/vm/ci/ciMethodHandle.cpp
! src/share/vm/prims/methodHandleWalk.cpp

Changeset: dd031b2226de
Author:    iveresov
Date:      2011-01-10 18:46 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/dd031b2226de

4930919: race condition in MDO creation at back branch locations
Summary: Reuse set_method_data_for_bcp() to setup mdp after MDO creation.
Reviewed-by: kvn, never

! src/cpu/sparc/vm/interp_masm_sparc.cpp
! src/cpu/sparc/vm/interp_masm_sparc.hpp
! src/cpu/sparc/vm/templateInterpreter_sparc.cpp
! src/cpu/sparc/vm/templateTable_sparc.cpp
! src/cpu/x86/vm/interp_masm_x86_32.cpp
! src/cpu/x86/vm/interp_masm_x86_64.cpp
! src/cpu/x86/vm/templateInterpreter_x86_32.cpp
! src/cpu/x86/vm/templateInterpreter_x86_64.cpp
! src/cpu/x86/vm/templateTable_x86_32.cpp
! src/cpu/x86/vm/templateTable_x86_64.cpp
! src/share/vm/interpreter/interpreterRuntime.cpp
! src/share/vm/interpreter/interpreterRuntime.hpp

Changeset: d4fca0a6abde
Author:    kvn
Date:      2011-01-11 20:26 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/d4fca0a6abde

7011386: race in objArrayKlass::array_klass_impl
Summary: Move _lower_dimension field initialization before _higher_dimension and add storestore barrier.
Reviewed-by: dholmes, iveresov, never

! src/share/vm/oops/arrayKlass.hpp
! src/share/vm/oops/objArrayKlass.cpp
! src/share/vm/oops/typeArrayKlass.cpp
! src/share/vm/runtime/vmStructs.cpp

Changeset: bb8e3b66bde6
Author:    twisti
Date:      2011-01-13 07:20 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/bb8e3b66bde6

Merge

! src/cpu/sparc/vm/templateTable_sparc.cpp
! src/cpu/x86/vm/templateTable_x86_32.cpp
! src/cpu/x86/vm/templateTable_x86_64.cpp
! src/os_cpu/linux_x86/vm/linux_x86_32.s
! src/os_cpu/solaris_x86/vm/solaris_x86_32.il

Changeset: c17b998c5926
Author:    iveresov
Date:      2011-01-12 18:33 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/c17b998c5926

7011627: C1: call_RT must support targets that don't fit in wdisp30
Summary: Make both compilers emit near and far calls when necessary.
Reviewed-by: never, kvn, phh

! src/cpu/sparc/vm/assembler_sparc.hpp
! src/cpu/sparc/vm/assembler_sparc.inline.hpp
! src/cpu/sparc/vm/sparc.ad

Changeset: 5ae3e3b03224
Author:    twisti
Date:      2011-01-13 07:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/5ae3e3b03224

Merge

! src/cpu/sparc/vm/assembler_sparc.hpp

Changeset: df307487d610
Author:    dholmes
Date:      2011-01-09 17:16 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/df307487d610

7010665: Misplaced membar in C1 implementation of Unsafe.get/putXXX
Summary: Modify membars to match regular volatile variable handling
Reviewed-by: iveresov, kvn, never

! src/share/vm/c1/c1_LIRGenerator.cpp

Changeset: e31d8c656c5b
Author:    dcubed
Date:      2011-01-10 09:23 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/e31d8c656c5b

Merge

! src/share/vm/c1/c1_LIRGenerator.cpp

Changeset: 7246a374a9f2
Author:    kamg
Date:      2011-01-10 17:14 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/7246a374a9f2

6458402: 3 jvmti tests fail with CMS and +ExplicitGCInvokesConcurrent
Summary: Make JvmtiGCMark safe to run non-safepoint and instrument CMS
Reviewed-by: ysr, dcubed

! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
! src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
! src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp
! src/share/vm/gc_implementation/shared/vmGCOperations.cpp
! src/share/vm/gc_implementation/shared/vmGCOperations.hpp
! src/share/vm/prims/jvmti.xml
! src/share/vm/prims/jvmtiExport.cpp
! src/share/vm/prims/jvmtiExport.hpp
! src/share/vm/prims/jvmtiImpl.cpp
! src/share/vm/prims/jvmtiImpl.hpp
! src/share/vm/prims/jvmtiTagMap.cpp
! src/share/vm/prims/jvmtiTagMap.hpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/jniHandles.cpp

Changeset: db2b0f8c1cef
Author:    kamg
Date:      2011-01-11 10:06 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/db2b0f8c1cef

6814943: getcpool001 catches more than one JvmtiThreadState problem
Summary: Mark field volatile, use membars, and change access order to close race
Reviewed-by: dcubed, dholmes

! src/share/vm/prims/jvmtiEventController.cpp
! src/share/vm/prims/jvmtiExport.cpp
! src/share/vm/runtime/thread.cpp
! src/share/vm/runtime/thread.hpp

Changeset: 5577848f5923
Author:    phh
Date:      2011-01-11 17:33 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/5577848f5923

7011463: Sparc MacroAssembler::incr_allocated_bytes() needs a RegisterOrConstant argument
Summary: Replaced incr_allocated_bytes() formals var_size_in_bytes and con_size_in_bytes with a single RegisterOrConstant formal.
Reviewed-by: twisti, jcoomes

! src/cpu/sparc/vm/assembler_sparc.cpp
! src/cpu/sparc/vm/assembler_sparc.hpp
! src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp
! src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
! src/cpu/sparc/vm/templateTable_sparc.cpp

Changeset: 0ca32cc95d7b
Author:    phh
Date:      2011-01-11 17:50 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/0ca32cc95d7b

Merge


Changeset: 8f8dfba37802
Author:    kevinw
Date:      2011-01-12 15:44 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/8f8dfba37802

6994753: Implement optional hook to a Java method at VM startup.
Reviewed-by: mchung, acorn

! src/share/vm/classfile/systemDictionary.hpp
! src/share/vm/classfile/vmSymbols.hpp
! src/share/vm/prims/jvm.h
! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/java.cpp
! src/share/vm/runtime/java.hpp
! src/share/vm/runtime/thread.cpp

Changeset: 34d64ad817f4
Author:    coleenp
Date:      2011-01-12 13:59 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/34d64ad817f4

7009828: Fix for 6938627 breaks visualvm monitoring when -Djava.io.tmpdir is defined
Summary: Change get_temp_directory() back to /tmp and %TEMP% like it always was and where the tools expect it to be.
Reviewed-by: phh, dcubed, kamg, alanb

! src/os/linux/vm/os_linux.cpp
! src/os/solaris/vm/os_solaris.cpp
! src/os/windows/vm/os_windows.cpp
! src/share/vm/utilities/vmError.cpp

Changeset: 856ecff79cf7
Author:    dcubed
Date:      2011-01-13 08:32 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/856ecff79cf7

Merge

! src/cpu/sparc/vm/assembler_sparc.hpp
! src/cpu/sparc/vm/templateTable_sparc.cpp

Changeset: 4947ee68d19c
Author:    ysr
Date:      2011-01-06 23:50 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/4947ee68d19c

7008136: CMS: assert((HeapWord*)nextChunk <= _limit) failed: sweep invariant
Summary: The recorded _sweep_limit may not necessarily remain a block boundary as the old generation expands during a concurrent cycle. Terminal actions inside the sweep closure need to be aware of this as they cross over the limit.
Reviewed-by: johnc, minqi

! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp

Changeset: 2250ee17e258
Author:    tonyp
Date:      2011-01-12 13:06 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/2250ee17e258

7007068: G1: refine the BOT during evac failure handling
Summary: During evacuation failure handling we refine the BOT to reflect the location of all the objects in the regions we scan. The changeset includes some minor cleanup: a) non-product print_on() method on the G1 BOT class, b) added more complete BOT verification during heap / region verification, c) slight modification to the BOT set up for humongous regions to be more consistent with the BOT set up during evac failure handling, and d) removed a couple of unused methods.
Reviewed-by: johnc, ysr

! src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp
! src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
! src/share/vm/gc_implementation/g1/heapRegion.cpp
! src/share/vm/gc_implementation/g1/heapRegion.hpp
! src/share/vm/gc_implementation/g1/heapRegionSeq.cpp

Changeset: b158bed62ef5
Author:    tonyp
Date:      2011-01-12 16:34 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/b158bed62ef5

6994297: G1: do first-level slow-path allocations with a CAS
Summary: First attempt to allocate out the current alloc region using a CAS instead of taking the Heap_lock (first level of G1's slow allocation path). Only if that fails and it's necessary to replace the current alloc region take the Heap_lock (that's the second level of G1's slow allocation path).
Reviewed-by: johnc, brutisso, ysr

! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
! src/share/vm/gc_implementation/g1/heapRegion.hpp

Changeset: 2e0b0c4671e4
Author:    brutisso
Date:      2011-01-13 04:43 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/2e0b0c4671e4

6941122: G1: UseLargePages does not work with G1 garbage collector
Summary: Pass the value of UseLargePages instead of false as the "large" parameter when reserving the G1 heap.
Reviewed-by: tonyp, johnc, phh

! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp

Changeset: c91cc404ca46
Author:    ysr
Date:      2011-01-13 11:33 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/c91cc404ca46

7011940: iCMS: SIGSEGV in SweepClosure::do_already_free_chunk(FreeChunk*)+0x360
Summary: Revert a (relaxed version of the) bounds-check that was incorrectly removed in the fix for 7008136.
Reviewed-by: jmasa, johnc

! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp

Changeset: ffd725ff6943
Author:    johnc
Date:      2011-01-13 17:19 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/ffd725ff6943

Merge

! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp

Changeset: 0915f9be781c
Author:    trims
Date:      2011-01-13 22:54 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/0915f9be781c

Merge


Changeset: 75efcee5ac47
Author:    minqi
Date:      2010-10-07 13:49 -0700
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/75efcee5ac47

6966589: hs16-b08 causes java.lang.StackOverflowError
Reviewed-by: mchung, dholmes, chrisphi

! src/share/vm/classfile/classLoader.cpp
! src/share/vm/classfile/classLoader.hpp

Changeset: 85c73c0edb06
Author:    kvn
Date:      2011-01-18 17:10 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/85c73c0edb06

7012965: Fix failed on sparc for 7009756: volatile variables could be broken throw reflection API
Summary: Use LDX/STX on v9 and LDD/STD on v8 sparc for volatile long moves.
Reviewed-by: never

! src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp
! src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp
! src/os_cpu/solaris_sparc/vm/solaris_sparc.il

Changeset: b599a4c6c2df
Author:    iveresov
Date:      2011-01-18 18:00 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/b599a4c6c2df

7012766: assert(false) failed: DEBUG MESSAGE in MacroAssembler::debug32
Summary: Interpreter expects to see methodOop in rbx on method entry, which needs to be restored after call to profile_method.
Reviewed-by: kvn, never

! src/cpu/x86/vm/templateInterpreter_x86_32.cpp
! src/cpu/x86/vm/templateInterpreter_x86_64.cpp

Changeset: 8012aa3ccede
Author:    never
Date:      2011-01-13 22:15 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/8012aa3ccede

4926272: methodOopDesc::method_from_bcp is unsafe
Reviewed-by: coleenp, jrose, kvn, dcubed

! src/share/vm/c1/c1_GraphBuilder.cpp
! src/share/vm/c1/c1_Runtime1.cpp
! src/share/vm/ci/bcEscapeAnalyzer.cpp
! src/share/vm/ci/ciMethod.hpp
! src/share/vm/ci/ciMethodBlocks.cpp
! src/share/vm/ci/ciStreams.hpp
! src/share/vm/ci/ciTypeFlow.cpp
! src/share/vm/code/nmethod.cpp
! src/share/vm/compiler/methodLiveness.cpp
! src/share/vm/interpreter/bytecode.cpp
! src/share/vm/interpreter/bytecode.hpp
! src/share/vm/interpreter/bytecodeInterpreter.cpp
! src/share/vm/interpreter/bytecodeStream.cpp
! src/share/vm/interpreter/bytecodeStream.hpp
! src/share/vm/interpreter/bytecodeTracer.cpp
! src/share/vm/interpreter/bytecodes.cpp
! src/share/vm/interpreter/bytecodes.hpp
! src/share/vm/interpreter/interpreter.cpp
! src/share/vm/interpreter/interpreterRuntime.cpp
! src/share/vm/interpreter/interpreterRuntime.hpp
! src/share/vm/interpreter/rewriter.cpp
! src/share/vm/interpreter/templateInterpreter.cpp
! src/share/vm/oops/generateOopMap.cpp
! src/share/vm/oops/methodDataOop.cpp
! src/share/vm/oops/methodOop.cpp
! src/share/vm/oops/methodOop.hpp
! src/share/vm/prims/jvmtiRedefineClasses.cpp
! src/share/vm/prims/methodComparator.cpp
! src/share/vm/runtime/deoptimization.cpp
! src/share/vm/runtime/frame.cpp
! src/share/vm/runtime/relocator.hpp
! src/share/vm/runtime/sharedRuntime.cpp
! src/share/vm/runtime/vframeArray.cpp

Changeset: 17c778814856
Author:    coleenp
Date:      2011-01-14 13:47 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/17c778814856

6811367: Fix code in HeapDumper::dump_heap() to avoid buffer overrun
Summary: Check buffer size before using and use dynamic buffer sizes for subsequent calls.
Reviewed-by: kamg, dholmes

! src/share/vm/services/heapDumper.cpp

Changeset: 633a44a9fc45
Author:    dcubed
Date:      2011-01-19 07:15 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/633a44a9fc45

Merge

! src/share/vm/interpreter/interpreterRuntime.cpp
! src/share/vm/interpreter/interpreterRuntime.hpp

Changeset: c1a0ede55d6f
Author:    dcubed
Date:      2011-01-19 07:41 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/c1a0ede55d6f

7012493: 2/2 6849574/Test.java fails with Internal Error (src/share/vm/prims/jvmtiTagMap.cpp:3294)
Summary: Refine assertion to work before VMThread has started.
Reviewed-by: ysr, never, dholmes, acorn

! src/share/vm/prims/jvmtiTagMap.cpp

Changeset: 2f33b03bd915
Author:    never
Date:      2011-01-19 08:16 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/2f33b03bd915

7013008: 2/3 assert(method == NULL || check_method(method, bcp)) failed: bcp must point into method
Summary: The Relocator should pass a NULL methodOop when rewriting since its resource array can never contain breakpoints.
Reviewed-by: dcubed, kvn, coleenp

! src/share/vm/runtime/relocator.hpp

Changeset: 9afee0b9fc1d
Author:    kamg
Date:      2011-01-19 13:51 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/9afee0b9fc1d

7012505: BreakpointWithFullGC.sh fails with Internal Error (src/share/vm/oops/methodOop.cpp:220)
Summary: Rebuild breakpoint cache at gc_epilogue instead of during oops_do
Reviewed-by: dcubed, ysr, coleenp

! src/share/vm/ci/ciEnv.cpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
! src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
! src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
! src/share/vm/memory/genMarkSweep.cpp
! src/share/vm/prims/jvmtiExport.cpp
! src/share/vm/prims/jvmtiExport.hpp
! src/share/vm/prims/jvmtiImpl.cpp
! src/share/vm/prims/jvmtiImpl.hpp
! src/share/vm/runtime/jniHandles.cpp

Changeset: 02b6913287da
Author:    dcubed
Date:      2011-01-19 19:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/02b6913287da

Merge


Changeset: 7e37af9d69ef
Author:    tonyp
Date:      2011-01-19 09:35 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/7e37af9d69ef

7011379: G1: overly long concurrent marking cycles
Summary: This changeset introduces filtering of SATB buffers at the point when they are about to be enqueued. If this filtering clears enough entries on each buffer, the buffer can then be re-used and not enqueued. This cuts down the number of SATB buffers that need to be processed by the concurrent marking threads.
Reviewed-by: johnc, ysr

! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
! src/share/vm/gc_implementation/g1/g1_globals.hpp
! src/share/vm/gc_implementation/g1/heapRegionSeq.hpp
! src/share/vm/gc_implementation/g1/ptrQueue.cpp
! src/share/vm/gc_implementation/g1/ptrQueue.hpp
! src/share/vm/gc_implementation/g1/satbQueue.cpp
! src/share/vm/gc_implementation/g1/satbQueue.hpp

Changeset: 182e9624aa42
Author:    johnc
Date:      2011-01-19 13:01 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/182e9624aa42

7012642: G1: JumbleGC002 test aborts with segmentation violation due to uncaught stack overflow
Summary: With recent G1 allocation path changes, the value of StackShadowPages in fast debug builds of the JVM, is no longer large enough to prevent the JVM C++ code from touching the stack guard pages. Increase the value of StackShadowPages to a suitable value.
Reviewed-by: ysr, tonyp, coleenp

! src/cpu/x86/vm/globals_x86.hpp

Changeset: cb913d743d09
Author:    johnc
Date:      2011-01-19 13:04 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/cb913d743d09

Merge


Changeset: 0fa27f37d4d4
Author:    tonyp
Date:      2011-01-19 19:30 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/0fa27f37d4d4

6977804: G1: remove the zero-filling thread
Summary: This changeset removes the zero-filling thread from G1 and collapses the two free region lists we had before (the "free" and "unclean" lists) into one. The new free list uses the new heap region sets / lists abstractions that we'll ultimately use it to keep track of all regions in the heap. A heap region set was also introduced for the humongous regions. Finally, this change increases the concurrency between the thread that completes freeing regions (after a cleanup pause) and the rest of the system (before we'd have to wait for said thread to complete before allocating a new region). The changest also includes a lot of refactoring and code simplification.
Reviewed-by: jcoomes, johnc

! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/gc_implementation/g1/concurrentMark.hpp
! src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
- src/share/vm/gc_implementation/g1/concurrentZFThread.cpp
- src/share/vm/gc_implementation/g1/concurrentZFThread.hpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
! src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
! src/share/vm/gc_implementation/g1/g1_globals.hpp
! src/share/vm/gc_implementation/g1/heapRegion.cpp
! src/share/vm/gc_implementation/g1/heapRegion.hpp
! src/share/vm/gc_implementation/g1/heapRegionSeq.cpp
! src/share/vm/gc_implementation/g1/heapRegionSeq.hpp
+ src/share/vm/gc_implementation/g1/heapRegionSet.cpp
+ src/share/vm/gc_implementation/g1/heapRegionSet.hpp
+ src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp
+ src/share/vm/gc_implementation/g1/heapRegionSets.cpp
+ src/share/vm/gc_implementation/g1/heapRegionSets.hpp
! src/share/vm/runtime/mutexLocker.cpp
! src/share/vm/runtime/mutexLocker.hpp
! src/share/vm/utilities/debug.hpp
! src/share/vm/utilities/globalDefinitions.hpp

Changeset: 377371490991
Author:    johnc
Date:      2011-01-20 13:57 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/377371490991

Merge

- src/share/vm/gc_implementation/g1/concurrentZFThread.cpp
- src/share/vm/gc_implementation/g1/concurrentZFThread.hpp
! src/share/vm/gc_implementation/g1/g1MarkSweep.cpp

Changeset: 5668ad215b80
Author:    trims
Date:      2011-01-20 17:53 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/5668ad215b80

Merge

! .hgtags

Changeset: 98bf1c6bb73a
Author:    trims
Date:      2011-01-20 18:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/98bf1c6bb73a

Merge


Changeset: 85330eaa15ee
Author:    iveresov
Date:      2011-01-21 00:01 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/85330eaa15ee

7013812: C1: deopt blob too far from patching stub
Summary: Use long jumps to get from patching stubs to deopt blob
Reviewed-by: kvn, never

! src/cpu/sparc/vm/c1_Runtime1_sparc.cpp

Changeset: d535bf4c1235
Author:    trims
Date:      2011-01-21 02:07 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/d535bf4c1235

Merge


Changeset: 9a5762f44859
Author:    trims
Date:      2011-02-01 18:57 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/9a5762f44859

Merge

! .hgtags
- src/share/vm/gc_implementation/g1/concurrentZFThread.cpp
- src/share/vm/gc_implementation/g1/concurrentZFThread.hpp

Changeset: 6ecdca5709df
Author:    cl
Date:      2011-02-03 17:22 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/6ecdca5709df

Added tag jdk7-b128 for changeset 9a5762f44859

! .hgtags



From lana.steuck at oracle.com  Fri Feb  4 17:01:45 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Sat, 05 Feb 2011 01:01:45 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jaxp: 3 new changesets
Message-ID: <20110205010145.C64B74742A@hg.openjdk.java.net>

Changeset: c532d6dbc8d1
Author:    cl
Date:      2011-01-20 15:52 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jaxp/rev/c532d6dbc8d1

Added tag jdk7-b126 for changeset 2fde639439c1

! .hgtags

Changeset: a42c6132c746
Author:    cl
Date:      2011-01-27 17:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jaxp/rev/a42c6132c746

Added tag jdk7-b127 for changeset c532d6dbc8d1

! .hgtags

Changeset: f5b60c5a310f
Author:    cl
Date:      2011-02-03 17:22 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jaxp/rev/f5b60c5a310f

Added tag jdk7-b128 for changeset a42c6132c746

! .hgtags



From lana.steuck at oracle.com  Fri Feb  4 17:01:52 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Sat, 05 Feb 2011 01:01:52 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jaxws: 3 new changesets
Message-ID: <20110205010152.865D74742B@hg.openjdk.java.net>

Changeset: ef19f173578c
Author:    cl
Date:      2011-01-20 15:52 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jaxws/rev/ef19f173578c

Added tag jdk7-b126 for changeset 6d772c5119d5

! .hgtags

Changeset: 88d74afc5593
Author:    cl
Date:      2011-01-27 17:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jaxws/rev/88d74afc5593

Added tag jdk7-b127 for changeset ef19f173578c

! .hgtags

Changeset: 0f7b39ad9024
Author:    cl
Date:      2011-02-03 17:22 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jaxws/rev/0f7b39ad9024

Added tag jdk7-b128 for changeset 88d74afc5593

! .hgtags



From lana.steuck at oracle.com  Fri Feb  4 17:04:42 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Sat, 05 Feb 2011 01:04:42 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 74 new changesets
Message-ID: <20110205011711.6E7194742C@hg.openjdk.java.net>

Changeset: 29e09de1d0b4
Author:    cl
Date:      2011-01-20 15:52 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/29e09de1d0b4

Added tag jdk7-b126 for changeset 8361ef97a0f9

! .hgtags

Changeset: 66c86ca4079a
Author:    cl
Date:      2011-01-27 17:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/66c86ca4079a

Added tag jdk7-b127 for changeset 29e09de1d0b4

! .hgtags

Changeset: 74d020ed7f5b
Author:    lana
Date:      2011-01-24 13:18 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/74d020ed7f5b

Merge

- src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.8.properties
- src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties

Changeset: 5d4723944cbd
Author:    dcherepanov
Date:      2011-01-20 14:27 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/5d4723944cbd

7011446: ./windows/classes/sun/awt/windows/WToolkit.java needs to avoid spurious wakeup
Reviewed-by: anthony

! src/windows/classes/sun/awt/windows/WToolkit.java

Changeset: 1bb32dc775c8
Author:    dcherepanov
Date:      2011-01-20 14:28 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/1bb32dc775c8

7011443: ./share/classes/sun/awt/SunToolkit.java needs to avoid spurious wakeup
Reviewed-by: anthony

! src/share/classes/sun/awt/SunToolkit.java

Changeset: 4cd8718d4548
Author:    dcherepanov
Date:      2011-01-20 14:29 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/4cd8718d4548

7011442: AppletClassLoader.java needs to avoid spurious wakeup
Reviewed-by: anthony

! src/share/classes/sun/applet/AppletClassLoader.java

Changeset: 4c9a9871830f
Author:    lana
Date:      2011-01-20 10:49 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/4c9a9871830f

Merge

- test/javax/script/E4XErrorTest.java
- test/sun/security/krb5/auto/basic.sh

Changeset: f6b73a9b3895
Author:    lana
Date:      2011-01-24 13:20 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/f6b73a9b3895

Merge


Changeset: 63972a313ca4
Author:    rupashka
Date:      2011-01-11 12:51 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/63972a313ca4

6589952: Swing: dead links in API documentation
Reviewed-by: alexp

! src/share/classes/javax/swing/AbstractButton.java
! src/share/classes/javax/swing/JEditorPane.java
! src/share/classes/javax/swing/SizeSequence.java
! src/share/classes/javax/swing/TransferHandler.java
! src/share/classes/javax/swing/event/InternalFrameAdapter.java
! src/share/classes/javax/swing/event/InternalFrameListener.java
! src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html
! src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html
! src/share/classes/javax/swing/text/AsyncBoxView.java
! src/share/classes/javax/swing/text/DefaultCaret.java
! src/share/classes/javax/swing/text/TableView.java
! src/share/classes/javax/swing/text/View.java
! src/share/classes/javax/swing/text/html/HTMLEditorKit.java
! src/share/classes/javax/swing/text/html/ParagraphView.java
! src/share/classes/javax/swing/text/html/StyleSheet.java

Changeset: 2a966dd275fc
Author:    rupashka
Date:      2011-01-13 20:12 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/2a966dd275fc

6990651: Regression: NPE when refreshing applet since 6u22-b01
Reviewed-by: peterz

! src/share/classes/javax/swing/text/html/parser/ParserDelegator.java
+ test/javax/swing/JLabel/7004134/bug7004134.java
+ test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java

Changeset: 5787add5b679
Author:    rupashka
Date:      2011-01-17 19:14 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/5787add5b679

6342301: Bad interaction between setting the ui and file filters in JFileChooser
Reviewed-by: alexp

! src/share/classes/javax/swing/JFileChooser.java
+ test/javax/swing/JFileChooser/6342301/bug6342301.java

Changeset: ca3bafeffd3b
Author:    rupashka
Date:      2011-01-19 17:01 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/ca3bafeffd3b

6246816: SwingSet2 should be rewritten
Reviewed-by: peterz

! make/common/Demo.gmk
! make/mkdemo/jfc/Makefile
+ make/mkdemo/jfc/SwingSet3/Makefile

Changeset: e93106dc798b
Author:    lana
Date:      2011-01-19 21:51 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/e93106dc798b

Merge

- test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html
- test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java
- test/javax/script/E4XErrorTest.java
- test/javax/swing/SwingWorker/6480289/bug6480289.java
- test/sun/security/krb5/auto/basic.sh

Changeset: b45ea2c3bd6d
Author:    rupashka
Date:      2011-01-24 18:04 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/b45ea2c3bd6d

6735293: javax.swing.text.NavigationFilter.getNextVisualPositionFrom() not always throws BadLocationException
Reviewed-by: peterz

! src/share/classes/javax/swing/text/View.java
+ test/javax/swing/text/NavigationFilter/6735293/bug6735293.java

Changeset: 1f3ecbfa0c29
Author:    lana
Date:      2011-01-24 13:21 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/1f3ecbfa0c29

Merge


Changeset: b8663921f5d7
Author:    chegar
Date:      2011-01-07 13:08 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/b8663921f5d7

7000511: PrintStream, PrintWriter, Formatter, Scanner leave files open when exception thrown
Reviewed-by: alanb, mduigou

! src/share/classes/java/io/PrintStream.java
! src/share/classes/java/io/PrintWriter.java
! src/share/classes/java/util/Formatter.java
! src/share/classes/java/util/Scanner.java
! test/ProblemList.txt
+ test/java/io/PrintStream/FailingConstructors.java
+ test/java/io/PrintWriter/FailingConstructors.java
! test/java/util/Formatter/Constructors.java
+ test/java/util/Formatter/FailingConstructors.java
+ test/java/util/Scanner/FailingConstructors.java

Changeset: 5124c2a50539
Author:    alanb
Date:      2011-01-07 15:49 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/5124c2a50539

6993732: Remove the HPI
Reviewed-by: ohair, lancea, chegar, mduigou, mchung, mr

! make/common/Defs-linux.gmk
! make/common/Defs-solaris.gmk
! make/common/Defs-windows.gmk
! make/common/Defs.gmk
! make/common/Modules.gmk
! make/common/Release.gmk
! make/java/Makefile
! make/java/fdlibm/Makefile
- make/java/hpi/Makefile
- make/java/hpi/hpi_common.gmk
- make/java/hpi/native/Makefile
- make/java/hpi/native/mapfile-vers
- make/java/hpi/native/reorder-i586
- make/java/hpi/native/reorder-sparc
- make/java/hpi/native/reorder-sparcv9
- make/java/hpi/windows/Makefile
! make/tools/reorder/Makefile
- src/share/hpi/export/bool.h
- src/share/hpi/export/dll.h
- src/share/hpi/export/hpi.h
- src/share/hpi/include/hpi_impl.h
- src/share/hpi/include/vm_calls.h
- src/share/hpi/src/hpi.c
- src/solaris/hpi/export/byteorder_md.h
- src/solaris/hpi/export/hpi_md.h
- src/solaris/hpi/export/io_md.h
- src/solaris/hpi/export/path_md.h
- src/solaris/hpi/export/timeval_md.h
- src/solaris/hpi/include/hpi_init.h
- src/solaris/hpi/include/interrupt.h
- src/solaris/hpi/include/largefile.h
- src/solaris/hpi/include/largefile_linux.h
- src/solaris/hpi/include/largefile_solaris.h
- src/solaris/hpi/native_threads/include/condvar_md.h
- src/solaris/hpi/native_threads/include/monitor_md.h
- src/solaris/hpi/native_threads/include/mutex_md.h
- src/solaris/hpi/native_threads/include/np.h
- src/solaris/hpi/native_threads/include/porting.h
- src/solaris/hpi/native_threads/include/threads_md.h
- src/solaris/hpi/native_threads/src/condvar_md.c
- src/solaris/hpi/native_threads/src/interrupt_md.c
- src/solaris/hpi/native_threads/src/monitor_md.c
- src/solaris/hpi/native_threads/src/mutex_md.c
- src/solaris/hpi/native_threads/src/sys_api_td.c
- src/solaris/hpi/native_threads/src/threads_linux.c
- src/solaris/hpi/native_threads/src/threads_md.c
- src/solaris/hpi/native_threads/src/threads_solaris.c
- src/solaris/hpi/src/interrupt.c
- src/solaris/hpi/src/linker_md.c
- src/solaris/hpi/src/memory_md.c
- src/solaris/hpi/src/system_md.c
- src/windows/hpi/export/byteorder_md.h
- src/windows/hpi/export/hpi_md.h
- src/windows/hpi/export/io_md.h
- src/windows/hpi/export/path_md.h
- src/windows/hpi/export/timeval_md.h
- src/windows/hpi/include/monitor_md.h
- src/windows/hpi/include/mutex_md.h
- src/windows/hpi/include/threads_md.h
- src/windows/hpi/src/linker_md.c
- src/windows/hpi/src/memory_md.c
- src/windows/hpi/src/monitor_md.c
- src/windows/hpi/src/path_md.c
- src/windows/hpi/src/socket_md.c
- src/windows/hpi/src/sys_api_md.c
- src/windows/hpi/src/system_md.c
- src/windows/hpi/src/threads_md.c

Changeset: ddaffd64796c
Author:    alanb
Date:      2011-01-07 15:51 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/ddaffd64796c

Merge


Changeset: 6bf1c5958c22
Author:    chegar
Date:      2011-01-07 21:02 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/6bf1c5958c22

7009760: Possible stack corruption in Java_java_net_TwoStacksPlainSocketImpl_socketGetOption
Summary: SOCKET_ADDRESS -> SOCKETADDRESS
Reviewed-by: alanb

! src/windows/native/java/net/TwoStacksPlainSocketImpl.c

Changeset: 3dbc783a8073
Author:    smarks
Date:      2011-01-07 15:39 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/3dbc783a8073

7008728: diamond conversion of basic security, permissions, authentication
Reviewed-by: mullan

! src/share/classes/com/sun/security/auth/PolicyFile.java
! src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
! src/share/classes/com/sun/security/auth/login/ConfigFile.java
! src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
! src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
! src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
! src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
! src/share/classes/java/security/AccessControlContext.java
! src/share/classes/java/security/BasicPermission.java
! src/share/classes/java/security/CodeSource.java
! src/share/classes/java/security/Permissions.java
! src/share/classes/java/security/ProtectionDomain.java
! src/share/classes/java/security/Provider.java
! src/share/classes/java/security/SecureClassLoader.java
! src/share/classes/java/security/Security.java
! src/share/classes/java/security/UnresolvedPermission.java
! src/share/classes/java/security/UnresolvedPermissionCollection.java
! src/share/classes/javax/security/auth/PrivateCredentialPermission.java
! src/share/classes/javax/security/auth/SubjectDomainCombiner.java
! src/share/classes/javax/security/auth/kerberos/DelegationPermission.java
! src/share/classes/javax/security/auth/kerberos/ServicePermission.java
! src/share/classes/sun/security/acl/AclEntryImpl.java
! src/share/classes/sun/security/acl/AclImpl.java
! src/share/classes/sun/security/acl/GroupImpl.java
! test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java
! test/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java

Changeset: ee5bf287d0c4
Author:    alanb
Date:      2011-01-10 09:32 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/ee5bf287d0c4

7002957: (fc) FileChannel.transferTo fails to load libsendfile on Solaris 64-bit
Reviewed-by: chegar

! make/java/nio/Makefile
! src/solaris/native/sun/nio/ch/FileChannelImpl.c

Changeset: f4d755bbdabe
Author:    lancea
Date:      2011-01-10 14:43 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/f4d755bbdabe

6544224: Remove the need of sun.reflect.misc
Reviewed-by: alanb

! src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java

Changeset: 2a0ff59928de
Author:    smarks
Date:      2011-01-10 17:06 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/2a0ff59928de

7005608: diamond conversion of JCA and crypto providers
Reviewed-by: wetmore

! src/share/classes/java/security/Security.java
! src/share/classes/sun/security/jca/ProviderList.java
! src/share/classes/sun/security/jca/Providers.java
! src/share/classes/sun/security/provider/PolicyFile.java
! src/share/classes/sun/security/provider/Sun.java
! src/share/classes/sun/security/provider/VerificationProvider.java
! src/share/classes/sun/security/provider/X509Factory.java
! src/share/classes/sun/security/rsa/RSACore.java
! src/share/classes/sun/security/rsa/SunRsaSign.java

Changeset: befe813e24d2
Author:    lancea
Date:      2011-01-11 12:36 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/befe813e24d2

7000693: java.sql.Timestamp compareTo() issues using low values
Reviewed-by: okutsu

! src/share/classes/java/sql/Timestamp.java

Changeset: 6d0217114886
Author:    smarks
Date:      2011-01-11 13:42 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/6d0217114886

7011095: revert diamond changes from 6880112 that occur in method args
Reviewed-by: darcy, alanb

! src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
! src/share/classes/java/io/ObjectStreamClass.java
! src/share/classes/java/lang/StringCoding.java
! src/share/classes/java/util/logging/Logger.java

Changeset: cb3ecb5e4ce5
Author:    dl
Date:      2011-01-12 14:40 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/cb3ecb5e4ce5

7005424: Resync java.util.concurrent classes with Dougs CVS - Jan 2011
Reviewed-by: dholmes, chegar, mduigou

! src/share/classes/java/util/Collections.java
! src/share/classes/java/util/LinkedList.java
! src/share/classes/java/util/concurrent/ArrayBlockingQueue.java
! src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
! src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
! src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java
! src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
! src/share/classes/java/util/concurrent/ForkJoinPool.java
! src/share/classes/java/util/concurrent/ForkJoinTask.java
! src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
! src/share/classes/java/util/concurrent/LinkedBlockingDeque.java
! src/share/classes/java/util/concurrent/LinkedBlockingQueue.java
! src/share/classes/java/util/concurrent/LinkedTransferQueue.java
! src/share/classes/java/util/concurrent/Phaser.java
! src/share/classes/java/util/concurrent/PriorityBlockingQueue.java
! src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java
! src/share/classes/java/util/concurrent/SynchronousQueue.java
! src/share/classes/java/util/concurrent/ThreadPoolExecutor.java
! src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java
! src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java
! src/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java
! src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
! src/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java
! src/share/classes/java/util/concurrent/locks/Condition.java
! test/ProblemList.txt
! test/java/util/WeakHashMap/GCDuringIteration.java
! test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java
! test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java
! test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java
! test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java
! test/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java
! test/java/util/concurrent/Executors/AutoShutdown.java
! test/java/util/concurrent/Phaser/Basic.java
+ test/java/util/concurrent/Phaser/FickleRegister.java
+ test/java/util/concurrent/Phaser/PhaseOverflow.java
+ test/java/util/concurrent/Phaser/TieredArriveLoops.java
! test/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java

Changeset: a5a22f93e4c5
Author:    smarks
Date:      2011-01-12 13:52 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/a5a22f93e4c5

7008713: diamond conversion of kerberos5 and security tools
Reviewed-by: weijun

! src/share/classes/sun/security/krb5/Config.java
! src/share/classes/sun/security/krb5/KdcComm.java
! src/share/classes/sun/security/krb5/PrincipalName.java
! src/share/classes/sun/security/krb5/Realm.java
! src/share/classes/sun/security/krb5/internal/Authenticator.java
! src/share/classes/sun/security/krb5/internal/AuthorizationData.java
! src/share/classes/sun/security/krb5/internal/EncAPRepPart.java
! src/share/classes/sun/security/krb5/internal/HostAddresses.java
! src/share/classes/sun/security/krb5/internal/KDCReq.java
! src/share/classes/sun/security/krb5/internal/KDCReqBody.java
! src/share/classes/sun/security/krb5/internal/KRBCred.java
! src/share/classes/sun/security/krb5/internal/KRBError.java
! src/share/classes/sun/security/krb5/internal/KrbCredInfo.java
! src/share/classes/sun/security/krb5/internal/LastReq.java
! src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
! src/share/classes/sun/security/krb5/internal/crypto/EType.java
! src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
! src/share/classes/sun/security/tools/JarSigner.java
! src/share/classes/sun/security/tools/KeyTool.java
! src/share/classes/sun/security/tools/policytool/PolicyTool.java
! test/sun/security/krb5/IPv6.java
! test/sun/security/krb5/auto/CleanState.java
! test/sun/security/krb5/auto/Context.java
! test/sun/security/krb5/auto/HttpNegotiateServer.java
! test/sun/security/krb5/auto/KDC.java
! test/sun/security/krb5/auto/LoginModuleOptions.java
! test/sun/security/krb5/tools/KtabCheck.java

Changeset: f5c0b3cbee2f
Author:    kamg
Date:      2011-01-12 11:47 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/f5c0b3cbee2f

6436034: Instance filter doesn't filter event if it occurs in native method
Summary: Use 'GetLocalInstance' JVMTI extension if it exists
Reviewed-by: coleenp, dcubed

! src/share/back/debugInit.c
! src/share/back/eventFilter.c
! src/share/instrument/JPLISAgent.c
! src/share/javavm/export/jvmti.h
+ test/com/sun/jdi/NativeInstanceFilter.java
+ test/com/sun/jdi/NativeInstanceFilterTarg.java

Changeset: 295f6b861c12
Author:    kamg
Date:      2011-01-12 15:27 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/295f6b861c12

Merge


Changeset: 538f913777cf
Author:    michaelm
Date:      2011-01-13 11:01 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/538f913777cf

6896088: URLClassLoader.close() apparently not working for JAR URLs on Windows
Reviewed-by: chegar

! src/share/classes/sun/misc/URLClassPath.java
+ test/java/net/URLClassLoader/B6896088.java

Changeset: 9f265d55c1c4
Author:    michaelm
Date:      2011-01-13 11:02 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/9f265d55c1c4

Merge


Changeset: 694951adefec
Author:    chegar
Date:      2011-01-13 13:24 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/694951adefec

6964547: Impossible to set useV4 in SocksSocketImpl
Summary: Add socksProxyVersion property
Reviewed-by: alanb, michaelm

! make/sun/net/FILES_java.gmk
! src/share/classes/java/io/PrintStream.java
! src/share/classes/java/net/SocksSocketImpl.java
! src/share/classes/java/net/doc-files/net-properties.html
+ src/share/classes/sun/net/SocksProxy.java
! src/share/classes/sun/net/spi/DefaultProxySelector.java
+ test/java/net/Socks/SocksProxyVersion.java

Changeset: 38729ba6eb4f
Author:    michaelm
Date:      2011-01-12 15:05 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/38729ba6eb4f

6829919: URLClassLoader.close() doesn't close resource file if getResourceAsStream(...) was called before
Reviewed-by: chegar

! src/share/classes/java/net/URLClassLoader.java
! test/java/net/URLClassLoader/closetest/CloseTest.java
+ test/java/net/URLClassLoader/closetest/Common.java
+ test/java/net/URLClassLoader/closetest/GetResourceAsStream.java
+ test/java/net/URLClassLoader/closetest/build2.sh

Changeset: ed390b2e5ca4
Author:    michaelm
Date:      2011-01-13 11:10 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/ed390b2e5ca4

Merge


Changeset: 067b5f603fc8
Author:    michaelm
Date:      2011-01-13 14:41 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/067b5f603fc8

Merge


Changeset: 3215b22cd90e
Author:    michaelm
Date:      2011-01-13 16:33 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/3215b22cd90e

7003398: NetworkInterface equals() and hashCode() behaviors depend on permissions granted
Reviewed-by: chegar, alanb

! src/share/classes/java/net/NetworkInterface.java
+ test/java/net/NetworkInterface/Equals.java

Changeset: 29f2e311cce7
Author:    mduigou
Date:      2011-01-13 20:32 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/29f2e311cce7

6728865: Provide a better heuristics for Collections.disjoint method
Reviewed-by: alanb, dholmes, chegar, forax

! src/share/classes/java/util/Collections.java

Changeset: 59e352561146
Author:    darcy
Date:      2011-01-13 22:21 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/59e352561146

7012279: Project Coin: Clarify AutoCloseable and Throwable javadoc
Reviewed-by: jjb

! src/share/classes/java/lang/AutoCloseable.java
! src/share/classes/java/lang/Throwable.java

Changeset: 983364897f72
Author:    chegar
Date:      2011-01-14 22:34 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/983364897f72

7010903: impl. of http.maxConnections is different from the description in JavaSE document
Reviewed-by: alanb, michaelm

! src/share/classes/sun/net/www/http/KeepAliveCache.java

Changeset: d61d9bf190f5
Author:    smarks
Date:      2011-01-14 15:31 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/d61d9bf190f5

7012003: diamond conversion for ssl
Reviewed-by: wetmore

! 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/DefaultSSLContextImpl.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/ProtocolList.java
! src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
! src/share/classes/sun/security/ssl/SSLSessionImpl.java
! src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
! src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
! src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
! src/share/classes/sun/security/ssl/X509KeyManagerImpl.java
! test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java

Changeset: 507627325c81
Author:    sundar
Date:      2011-01-17 13:29 +0530
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/507627325c81

6508943: small typo in the documentation
6759414: javascript engine can not write to StringWriter
6869617: RhinoScriptEngine bug : ScriptException cause not set (with fix)
7012701: Add a test to check that Rhino's RegExp parser accepts unescaped '['
Reviewed-by: alanb, jjh

! src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
! src/share/classes/javax/script/CompiledScript.java
+ test/javax/script/CauseExceptionTest.java
+ test/javax/script/StringWriterPrintTest.java
+ test/javax/script/UnescapedBracketRegExTest.java

Changeset: 9596a600758c
Author:    lana
Date:      2011-01-19 19:00 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/9596a600758c

Merge

- test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html
- test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java
- test/javax/swing/SwingWorker/6480289/bug6480289.java

Changeset: e64b1f11cd0b
Author:    chegar
Date:      2011-01-20 15:23 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/e64b1f11cd0b

7011857: java/util/concurrent/Phaser/FickleRegister.java fails on solaris-sparc
Summary: Remove from ProblemList, failure resolved by 7009231
Reviewed-by: alanb

! test/ProblemList.txt

Changeset: cc195c981ae2
Author:    mchung
Date:      2011-01-20 22:17 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/cc195c981ae2

7013739: jdk_rmi target is missing in the top repo's test/Makefile
Reviewed-by: ohair, igor

! test/ProblemList.txt

Changeset: 2a8d1a0a2418
Author:    chegar
Date:      2011-01-21 17:02 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/2a8d1a0a2418

7012768: InetAddress lookupTable leaks/deadlocks when using unsupported name service spi
Reviewed-by: alanb, michaelm

! src/share/classes/java/net/InetAddress.java
- test/java/net/InetAddress/B4762344.java
- test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/InetAddress/Simple1NameServiceDescriptor.java
- test/java/net/InetAddress/Simple2NameServiceDescriptor.java
- test/java/net/InetAddress/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/B6442088.java
- test/sun/net/InetAddress/nameservice/CacheTest.java
- test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java
+ test/sun/net/InetAddress/nameservice/chaining/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
+ test/sun/net/InetAddress/nameservice/chaining/Providers.java
+ test/sun/net/InetAddress/nameservice/chaining/Simple1NameServiceDescriptor.java
+ test/sun/net/InetAddress/nameservice/chaining/Simple2NameServiceDescriptor.java
+ test/sun/net/InetAddress/nameservice/chaining/SimpleNameService.java
+ test/sun/net/InetAddress/nameservice/deadlock/Hang.java
+ test/sun/net/InetAddress/nameservice/deadlock/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
+ test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameService.java
+ test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameServiceDescriptor.java
+ test/sun/net/InetAddress/nameservice/simple/CacheTest.java
+ test/sun/net/InetAddress/nameservice/simple/DefaultCaching.java
+ test/sun/net/InetAddress/nameservice/simple/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
+ test/sun/net/InetAddress/nameservice/simple/SimpleNameService.java
+ test/sun/net/InetAddress/nameservice/simple/SimpleNameServiceDescriptor.java

Changeset: 6a7b8406a1b9
Author:    chegar
Date:      2011-01-21 17:04 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/6a7b8406a1b9

Merge


Changeset: f26d1a7fe4d2
Author:    mchung
Date:      2011-01-21 09:43 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/f26d1a7fe4d2

6912013: Remove the temporary launcher fix to add modules in the bootclasspath
Reviewed-by: ksrini

! src/share/bin/java.c
! src/share/bin/java.h
! src/share/classes/sun/launcher/LauncherHelper.java

Changeset: 9c18818e7a5f
Author:    mchung
Date:      2011-01-21 09:45 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/9c18818e7a5f

Merge

- test/java/net/InetAddress/B4762344.java
- test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/InetAddress/Simple1NameServiceDescriptor.java
- test/java/net/InetAddress/Simple2NameServiceDescriptor.java
- test/java/net/InetAddress/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/B6442088.java
- test/sun/net/InetAddress/nameservice/CacheTest.java
- test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java

Changeset: 2381e810330b
Author:    zgu
Date:      2011-01-20 10:45 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/2381e810330b

6983248: net/net001 and net/net003 fail on WinXP with JDK7-B108
Summary: Using closesocket to close socket handler to avoid invalid C runtime parameter exception.
Reviewed-by: alanb, phh, dcubed, dsamersoff, coleenp, acorn

! src/windows/demo/jvmti/hprof/hprof_md.c

Changeset: d03e47de3a89
Author:    zgu
Date:      2011-01-21 11:38 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/d03e47de3a89

Merge


Changeset: c73c178159d8
Author:    phh
Date:      2011-01-20 19:34 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/c73c178159d8

6173675: M&M: approximate memory allocation rate/amount per thread
Summary: Subclass com.sun.management.ThreadMXBean from java.lang.management.ThreadMXBean, add getAllocatedBytes() and friends to c.s.m.ThreadMXBean and have sun.management.ThreadImpl implement c.s.m.ThreadMXBean rather than j.l.m.ThreadMXBean.
Reviewed-by: mchung, alanb, dholmes, emcmanus

! make/java/management/mapfile-vers
+ src/share/classes/com/sun/management/ThreadMXBean.java
! src/share/classes/sun/management/ThreadImpl.java
! src/share/classes/sun/management/VMManagement.java
! src/share/classes/sun/management/VMManagementImpl.java
! src/share/javavm/export/jmm.h
! src/share/native/sun/management/ThreadImpl.c
! src/share/native/sun/management/VMManagementImpl.c
+ test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java
+ test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java
+ test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java

Changeset: 64ef2f52d781
Author:    phh
Date:      2011-01-21 07:29 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/64ef2f52d781

7013682: two test checking cpuTime filed java/lang/management/ThreadMXBean
Summary: Typo in 6173675 fix dropped getThreadCpuTime(long) result on the floor.
Reviewed-by: mchung, dholmes

! src/share/classes/sun/management/ThreadImpl.java

Changeset: cd13b2114f2e
Author:    phh
Date:      2011-01-22 08:42 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/cd13b2114f2e

Merge

! src/share/classes/sun/management/ThreadImpl.java

Changeset: d1365fdfb3ea
Author:    phh
Date:      2011-01-22 08:43 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/d1365fdfb3ea

Merge

- test/java/net/InetAddress/B4762344.java
- test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/InetAddress/Simple1NameServiceDescriptor.java
- test/java/net/InetAddress/Simple2NameServiceDescriptor.java
- test/java/net/InetAddress/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/B6442088.java
- test/sun/net/InetAddress/nameservice/CacheTest.java
- test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java

Changeset: 4cc447291326
Author:    sherman
Date:      2011-01-24 11:47 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/4cc447291326

7006576: (zipfs) Path.exists() always returns false on dirs when zip/JAR file built without dirs
7009092: (zipfs) ZipPath.isSameFile() should always return true if this Path and the given Path are equal.
7009085: (zipfs) ZipPath.normalize("/./.") returns null.
7009102: (zipfs) ZipPath.toRealPath() should always return absolute path.
Summary: zip filesystem provider update
Reviewed-by: alanb

! src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
! src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipPath.java
! test/demo/zipfs/PathOps.java
! test/demo/zipfs/ZipFSTester.java
! test/demo/zipfs/basic.sh

Changeset: 1f977c82b733
Author:    lana
Date:      2011-01-24 13:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/1f977c82b733

Merge

! make/common/Defs-windows.gmk
- make/java/hpi/Makefile
- make/java/hpi/hpi_common.gmk
- make/java/hpi/native/Makefile
- make/java/hpi/native/mapfile-vers
- make/java/hpi/native/reorder-i586
- make/java/hpi/native/reorder-sparc
- make/java/hpi/native/reorder-sparcv9
- make/java/hpi/windows/Makefile
- src/share/hpi/export/bool.h
- src/share/hpi/export/dll.h
- src/share/hpi/export/hpi.h
- src/share/hpi/include/hpi_impl.h
- src/share/hpi/include/vm_calls.h
- src/share/hpi/src/hpi.c
- src/solaris/hpi/export/byteorder_md.h
- src/solaris/hpi/export/hpi_md.h
- src/solaris/hpi/export/io_md.h
- src/solaris/hpi/export/path_md.h
- src/solaris/hpi/export/timeval_md.h
- src/solaris/hpi/include/hpi_init.h
- src/solaris/hpi/include/interrupt.h
- src/solaris/hpi/include/largefile.h
- src/solaris/hpi/include/largefile_linux.h
- src/solaris/hpi/include/largefile_solaris.h
- src/solaris/hpi/native_threads/include/condvar_md.h
- src/solaris/hpi/native_threads/include/monitor_md.h
- src/solaris/hpi/native_threads/include/mutex_md.h
- src/solaris/hpi/native_threads/include/np.h
- src/solaris/hpi/native_threads/include/porting.h
- src/solaris/hpi/native_threads/include/threads_md.h
- src/solaris/hpi/native_threads/src/condvar_md.c
- src/solaris/hpi/native_threads/src/interrupt_md.c
- src/solaris/hpi/native_threads/src/monitor_md.c
- src/solaris/hpi/native_threads/src/mutex_md.c
- src/solaris/hpi/native_threads/src/sys_api_td.c
- src/solaris/hpi/native_threads/src/threads_linux.c
- src/solaris/hpi/native_threads/src/threads_md.c
- src/solaris/hpi/native_threads/src/threads_solaris.c
- src/solaris/hpi/src/interrupt.c
- src/solaris/hpi/src/linker_md.c
- src/solaris/hpi/src/memory_md.c
- src/solaris/hpi/src/system_md.c
- src/windows/hpi/export/byteorder_md.h
- src/windows/hpi/export/hpi_md.h
- src/windows/hpi/export/io_md.h
- src/windows/hpi/export/path_md.h
- src/windows/hpi/export/timeval_md.h
- src/windows/hpi/include/monitor_md.h
- src/windows/hpi/include/mutex_md.h
- src/windows/hpi/include/threads_md.h
- src/windows/hpi/src/linker_md.c
- src/windows/hpi/src/memory_md.c
- src/windows/hpi/src/monitor_md.c
- src/windows/hpi/src/path_md.c
- src/windows/hpi/src/socket_md.c
- src/windows/hpi/src/sys_api_md.c
- src/windows/hpi/src/system_md.c
- src/windows/hpi/src/threads_md.c
- test/java/net/InetAddress/B4762344.java
- test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/InetAddress/Simple1NameServiceDescriptor.java
- test/java/net/InetAddress/Simple2NameServiceDescriptor.java
- test/java/net/InetAddress/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/B6442088.java
- test/sun/net/InetAddress/nameservice/CacheTest.java
- test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java

Changeset: 47cfd89c3227
Author:    lana
Date:      2011-01-28 10:04 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/47cfd89c3227

Merge

- make/java/hpi/Makefile
- make/java/hpi/hpi_common.gmk
- make/java/hpi/native/Makefile
- make/java/hpi/native/mapfile-vers
- make/java/hpi/native/reorder-i586
- make/java/hpi/native/reorder-sparc
- make/java/hpi/native/reorder-sparcv9
- make/java/hpi/windows/Makefile
- src/share/hpi/export/bool.h
- src/share/hpi/export/dll.h
- src/share/hpi/export/hpi.h
- src/share/hpi/include/hpi_impl.h
- src/share/hpi/include/vm_calls.h
- src/share/hpi/src/hpi.c
- src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.8.properties
- src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties
- src/solaris/hpi/export/byteorder_md.h
- src/solaris/hpi/export/hpi_md.h
- src/solaris/hpi/export/io_md.h
- src/solaris/hpi/export/path_md.h
- src/solaris/hpi/export/timeval_md.h
- src/solaris/hpi/include/hpi_init.h
- src/solaris/hpi/include/interrupt.h
- src/solaris/hpi/include/largefile.h
- src/solaris/hpi/include/largefile_linux.h
- src/solaris/hpi/include/largefile_solaris.h
- src/solaris/hpi/native_threads/include/condvar_md.h
- src/solaris/hpi/native_threads/include/monitor_md.h
- src/solaris/hpi/native_threads/include/mutex_md.h
- src/solaris/hpi/native_threads/include/np.h
- src/solaris/hpi/native_threads/include/porting.h
- src/solaris/hpi/native_threads/include/threads_md.h
- src/solaris/hpi/native_threads/src/condvar_md.c
- src/solaris/hpi/native_threads/src/interrupt_md.c
- src/solaris/hpi/native_threads/src/monitor_md.c
- src/solaris/hpi/native_threads/src/mutex_md.c
- src/solaris/hpi/native_threads/src/sys_api_td.c
- src/solaris/hpi/native_threads/src/threads_linux.c
- src/solaris/hpi/native_threads/src/threads_md.c
- src/solaris/hpi/native_threads/src/threads_solaris.c
- src/solaris/hpi/src/interrupt.c
- src/solaris/hpi/src/linker_md.c
- src/solaris/hpi/src/memory_md.c
- src/solaris/hpi/src/system_md.c
- src/windows/hpi/export/byteorder_md.h
- src/windows/hpi/export/hpi_md.h
- src/windows/hpi/export/io_md.h
- src/windows/hpi/export/path_md.h
- src/windows/hpi/export/timeval_md.h
- src/windows/hpi/include/monitor_md.h
- src/windows/hpi/include/mutex_md.h
- src/windows/hpi/include/threads_md.h
- src/windows/hpi/src/linker_md.c
- src/windows/hpi/src/memory_md.c
- src/windows/hpi/src/monitor_md.c
- src/windows/hpi/src/path_md.c
- src/windows/hpi/src/socket_md.c
- src/windows/hpi/src/sys_api_md.c
- src/windows/hpi/src/system_md.c
- src/windows/hpi/src/threads_md.c
- test/java/net/InetAddress/B4762344.java
- test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/InetAddress/Simple1NameServiceDescriptor.java
- test/java/net/InetAddress/Simple2NameServiceDescriptor.java
- test/java/net/InetAddress/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/B6442088.java
- test/sun/net/InetAddress/nameservice/CacheTest.java
- test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java

Changeset: 006c683ead1a
Author:    ohair
Date:      2011-01-05 14:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/006c683ead1a

6975326: Problem in install/make/rebase/Makefile, grep on empty pattern
6413588: Add 'ldd -r' and 'dump -Lv' checks to all .so files delivered in the JDK
7000995: Add check in makefiles to verify that msvcp100.dll is NOT used
Reviewed-by: mduigou

! make/com/sun/java/pack/Makefile
! make/common/Demo.gmk
! make/common/Library.gmk
! make/common/Program.gmk
! make/common/Release.gmk
! make/common/shared/Compiler-msvc.gmk
! make/common/shared/Defs-linux.gmk
! make/common/shared/Defs-solaris.gmk
! make/common/shared/Defs-utils.gmk
! make/common/shared/Defs-windows.gmk
! make/common/shared/Sanity-Settings.gmk
! make/common/shared/Sanity.gmk
! make/java/redist/Makefile

Changeset: 9576644931b2
Author:    ohair
Date:      2011-01-07 21:52 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/9576644931b2

6980024: Rebranding jre7/jdk7 License, Copyright, Readme
6912291: Third party license agreement should be present in all bundles
Reviewed-by: katleman

! make/common/Modules.gmk
! make/common/Release.gmk
! make/common/shared/Defs-control.gmk

Changeset: 8c3c6ac6fcdb
Author:    ohair
Date:      2011-01-10 09:59 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/8c3c6ac6fcdb

Merge


Changeset: 658559ca4526
Author:    ohair
Date:      2011-01-10 17:00 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/658559ca4526

7011382: Fix use of VS100COMNTOOLS when installed in non-default or non-space path
Reviewed-by: prr

! make/common/shared/Defs-windows.gmk

Changeset: fd6319676bd3
Author:    ohair
Date:      2011-01-10 17:53 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/fd6319676bd3

Merge


Changeset: 713d20f796c0
Author:    ohair
Date:      2011-01-10 18:07 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/713d20f796c0

6989472: Provide simple jdk identification information in the install image
Reviewed-by: alanb

! make/common/Release.gmk
! make/common/shared/Defs-versions.gmk

Changeset: 523386cfb731
Author:    ohair
Date:      2011-01-10 22:26 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/523386cfb731

Merge


Changeset: 83cef4633684
Author:    ohair
Date:      2011-01-13 17:51 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/83cef4633684

Merge


Changeset: 4241588a12c3
Author:    ohair
Date:      2011-01-13 13:49 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/4241588a12c3

7008047: remove sanity check of msival tool from JDK tree
Reviewed-by: billyh

! make/common/shared/Defs-windows.gmk
! make/common/shared/Sanity-Settings.gmk
! make/common/shared/Sanity.gmk

Changeset: 81e66ce6f501
Author:    ohair
Date:      2011-01-13 23:58 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/81e66ce6f501

Merge


Changeset: 0c29bbd10e19
Author:    ohair
Date:      2011-01-14 14:04 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/0c29bbd10e19

6950375: Remove msvcrt.dll from the Windows JRE bundles
Reviewed-by: prr

! make/Makefile
! make/common/Defs-windows.gmk
! make/common/shared/Defs-windows.gmk
! make/common/shared/Sanity-Settings.gmk
! make/common/shared/Sanity.gmk
! make/java/redist/Makefile
! make/jdk_generic_profile.sh
! src/share/demo/jvmti/index.html

Changeset: 329f49ab5c4c
Author:    ohair
Date:      2011-01-16 12:10 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/329f49ab5c4c

Merge


Changeset: 688f415db098
Author:    ohair
Date:      2011-01-26 16:05 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/688f415db098

Merge


Changeset: aecb8f0eb83b
Author:    ohair
Date:      2011-01-27 18:43 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/aecb8f0eb83b

Merge


Changeset: f08682e23279
Author:    ohair
Date:      2011-02-02 09:39 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/f08682e23279

Merge

! make/common/Defs-windows.gmk
! make/common/Demo.gmk
! make/common/Library.gmk
! make/common/Modules.gmk
! make/common/Program.gmk
! make/common/Release.gmk

Changeset: 07c68a15ec79
Author:    cl
Date:      2011-02-03 17:22 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/07c68a15ec79

Added tag jdk7-b128 for changeset f08682e23279

! .hgtags

Changeset: 21621a756b32
Author:    lana
Date:      2011-02-03 19:15 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/21621a756b32

Merge

- make/java/hpi/Makefile
- make/java/hpi/hpi_common.gmk
- make/java/hpi/native/Makefile
- make/java/hpi/native/mapfile-vers
- make/java/hpi/native/reorder-i586
- make/java/hpi/native/reorder-sparc
- make/java/hpi/native/reorder-sparcv9
- make/java/hpi/windows/Makefile
- src/share/hpi/export/bool.h
- src/share/hpi/export/dll.h
- src/share/hpi/export/hpi.h
- src/share/hpi/include/hpi_impl.h
- src/share/hpi/include/vm_calls.h
- src/share/hpi/src/hpi.c
- src/solaris/hpi/export/byteorder_md.h
- src/solaris/hpi/export/hpi_md.h
- src/solaris/hpi/export/io_md.h
- src/solaris/hpi/export/path_md.h
- src/solaris/hpi/export/timeval_md.h
- src/solaris/hpi/include/hpi_init.h
- src/solaris/hpi/include/interrupt.h
- src/solaris/hpi/include/largefile.h
- src/solaris/hpi/include/largefile_linux.h
- src/solaris/hpi/include/largefile_solaris.h
- src/solaris/hpi/native_threads/include/condvar_md.h
- src/solaris/hpi/native_threads/include/monitor_md.h
- src/solaris/hpi/native_threads/include/mutex_md.h
- src/solaris/hpi/native_threads/include/np.h
- src/solaris/hpi/native_threads/include/porting.h
- src/solaris/hpi/native_threads/include/threads_md.h
- src/solaris/hpi/native_threads/src/condvar_md.c
- src/solaris/hpi/native_threads/src/interrupt_md.c
- src/solaris/hpi/native_threads/src/monitor_md.c
- src/solaris/hpi/native_threads/src/mutex_md.c
- src/solaris/hpi/native_threads/src/sys_api_td.c
- src/solaris/hpi/native_threads/src/threads_linux.c
- src/solaris/hpi/native_threads/src/threads_md.c
- src/solaris/hpi/native_threads/src/threads_solaris.c
- src/solaris/hpi/src/interrupt.c
- src/solaris/hpi/src/linker_md.c
- src/solaris/hpi/src/memory_md.c
- src/solaris/hpi/src/system_md.c
- src/windows/hpi/export/byteorder_md.h
- src/windows/hpi/export/hpi_md.h
- src/windows/hpi/export/io_md.h
- src/windows/hpi/export/path_md.h
- src/windows/hpi/export/timeval_md.h
- src/windows/hpi/include/monitor_md.h
- src/windows/hpi/include/mutex_md.h
- src/windows/hpi/include/threads_md.h
- src/windows/hpi/src/linker_md.c
- src/windows/hpi/src/memory_md.c
- src/windows/hpi/src/monitor_md.c
- src/windows/hpi/src/path_md.c
- src/windows/hpi/src/socket_md.c
- src/windows/hpi/src/sys_api_md.c
- src/windows/hpi/src/system_md.c
- src/windows/hpi/src/threads_md.c
- test/java/net/InetAddress/B4762344.java
- test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/InetAddress/Simple1NameServiceDescriptor.java
- test/java/net/InetAddress/Simple2NameServiceDescriptor.java
- test/java/net/InetAddress/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/B6442088.java
- test/sun/net/InetAddress/nameservice/CacheTest.java
- test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java



From lana.steuck at oracle.com  Fri Feb  4 17:20:18 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Sat, 05 Feb 2011 01:20:18 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/langtools: 23 new changesets
Message-ID: <20110205012103.85A744742D@hg.openjdk.java.net>

Changeset: 1e6094c33187
Author:    cl
Date:      2011-01-20 15:52 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/1e6094c33187

Added tag jdk7-b126 for changeset 438a8ad60f7a

! .hgtags

Changeset: d79e283c7d9b
Author:    cl
Date:      2011-01-27 17:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/d79e283c7d9b

Added tag jdk7-b127 for changeset 1e6094c33187

! .hgtags

Changeset: d17f37522154
Author:    jjg
Date:      2011-01-10 14:57 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/d17f37522154

6992999: fully remove JSR 308 from langtools
Reviewed-by: mcimadamore

! src/share/classes/com/sun/source/tree/MethodTree.java
! src/share/classes/com/sun/source/tree/Tree.java
! src/share/classes/com/sun/source/tree/TreeVisitor.java
! src/share/classes/com/sun/source/tree/TypeParameterTree.java
! src/share/classes/com/sun/source/util/SimpleTreeVisitor.java
! src/share/classes/com/sun/source/util/TreeScanner.java
! src/share/classes/com/sun/tools/classfile/Attribute.java
! src/share/classes/com/sun/tools/classfile/ClassWriter.java
- src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java
- src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
- src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
- src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
! src/share/classes/com/sun/tools/javac/code/Attribute.java
! src/share/classes/com/sun/tools/javac/code/Symbol.java
- src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Flow.java
! src/share/classes/com/sun/tools/javac/comp/Lower.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/comp/TransTypes.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/share/classes/com/sun/tools/javac/jvm/Code.java
! src/share/classes/com/sun/tools/javac/jvm/Gen.java
! src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/share/classes/com/sun/tools/javac/tree/Pretty.java
! src/share/classes/com/sun/tools/javac/tree/TreeCopier.java
! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
! src/share/classes/com/sun/tools/javac/tree/TreeScanner.java
! src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java
! src/share/classes/com/sun/tools/javap/AnnotationWriter.java
! src/share/classes/com/sun/tools/javap/AttributeWriter.java
! src/share/classes/com/sun/tools/javap/CodeWriter.java
! src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java
- src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
! test/tools/javac/diags/examples.not-yet.txt

Changeset: 7c537f4298fb
Author:    jjg
Date:      2011-01-10 15:08 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/7c537f4298fb

6396503: javac should not require assertions enabled
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/javac/Main.java
! src/share/classes/com/sun/tools/javac/code/Attribute.java
! src/share/classes/com/sun/tools/javac/code/Scope.java
! src/share/classes/com/sun/tools/javac/code/Symbol.java
! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Flow.java
! src/share/classes/com/sun/tools/javac/comp/Lower.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/comp/TransTypes.java
! src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java
! src/share/classes/com/sun/tools/javac/jvm/CRTable.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
! src/share/classes/com/sun/tools/javac/jvm/Code.java
! src/share/classes/com/sun/tools/javac/jvm/Gen.java
! src/share/classes/com/sun/tools/javac/jvm/Items.java
! src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/share/classes/com/sun/tools/javac/parser/Scanner.java
! src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
! src/share/classes/com/sun/tools/javac/tree/JCTree.java
! src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
! src/share/classes/com/sun/tools/javac/tree/TreeMaker.java
! src/share/classes/com/sun/tools/javac/tree/TreeScanner.java
! src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java
+ src/share/classes/com/sun/tools/javac/util/Assert.java
! src/share/classes/com/sun/tools/javac/util/Bits.java
! src/share/classes/com/sun/tools/javac/util/Context.java
! src/share/classes/com/sun/tools/javac/util/List.java
! src/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java
! src/share/classes/javax/tools/ToolProvider.java

Changeset: 17b271281525
Author:    jjg
Date:      2011-01-11 08:05 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/17b271281525

6993305: starting position of a method without modifiers and with type parameters is incorrect
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
+ test/tools/javac/tree/T6993305.java

Changeset: d33d8c381aa1
Author:    jjg
Date:      2011-01-13 11:48 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/d33d8c381aa1

6430241: Hard to disable symbol file feature through API
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
! src/share/classes/com/sun/tools/javac/file/Paths.java
+ test/tools/javac/api/T6430241.java

Changeset: a466f00c5cd2
Author:    bpatel
Date:      2011-01-13 21:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/a466f00c5cd2

7010528: javadoc performance regression
Reviewed-by: jjg

! src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java
! src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java

Changeset: 2d5aff89aaa3
Author:    mcimadamore
Date:      2011-01-14 09:45 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/2d5aff89aaa3

6992698: JSR 292: remove support for transient syntax in polymorphic signature calls
Summary: special syntax to denote indy return type through type parameters should be removed (and cast shall be used instead)
Reviewed-by: jjg, jrose

! src/share/classes/com/sun/tools/javac/code/Symtab.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Flow.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/jvm/Gen.java
! src/share/classes/com/sun/tools/javac/jvm/Items.java
! src/share/classes/com/sun/tools/javac/main/Main.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/share/classes/com/sun/tools/javac/util/Names.java
- test/tools/javac/diags/examples/TypeParameterOnPolymorphicSignature.java
- test/tools/javac/meth/InvokeDynTrans.out
- test/tools/javac/meth/InvokeMHTrans.java
- test/tools/javac/meth/InvokeMHTrans.out
! test/tools/javac/meth/TestCP.java
! test/tools/javac/meth/XlintWarn.java

Changeset: c8d312dd17bc
Author:    mcimadamore
Date:      2011-01-14 09:45 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/c8d312dd17bc

7007432: Test generic types well-formedness
Summary: add a new kind of check (well-formedness of generic type w.r.t. declared bounds) in the type-harness
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Check.java
+ test/tools/javac/types/GenericTypeWellFormednessTest.java
! test/tools/javac/types/TypeHarness.java

Changeset: 712be35e40b5
Author:    mcimadamore
Date:      2011-01-14 09:46 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/712be35e40b5

6949040: java.dyn package must be compiled with -target 7 or better
Summary: issue error (rather than warning) when @PolymorphicSignature is found and target < 7
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/diags/examples.not-yet.txt

Changeset: 7c7c1787fbbe
Author:    jjg
Date:      2011-01-14 11:45 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/7c7c1787fbbe

6419926: JSR 199: FileObject.toUri() generates URI without schema (Solaris)
Reviewed-by: mcimadamore

+ test/tools/javac/api/T6419926.java

Changeset: 0a509c765657
Author:    jjg
Date:      2011-01-14 11:55 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/0a509c765657

6571165: Minor doc bugs in JavaCompiler.java
Reviewed-by: mcimadamore

! src/share/classes/javax/tools/JavaCompiler.java

Changeset: 19f9b6548c70
Author:    ksrini
Date:      2011-01-14 13:59 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/19f9b6548c70

7011272: langtools build.xml should provide a patch target
Reviewed-by: jonathan, jjh

! make/build.xml

Changeset: 5cf6c432ef2f
Author:    ksrini
Date:      2011-01-18 08:37 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/5cf6c432ef2f

6982999: tools must support -target 7 bytecodes
Reviewed-by: jjg, jrose

! src/share/classes/com/sun/tools/classfile/Attribute.java
+ src/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java
! src/share/classes/com/sun/tools/classfile/ClassTranslator.java
! src/share/classes/com/sun/tools/classfile/ClassWriter.java
! src/share/classes/com/sun/tools/classfile/ConstantPool.java
! src/share/classes/com/sun/tools/classfile/Dependencies.java
! src/share/classes/com/sun/tools/javac/jvm/ClassFile.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javap/AttributeWriter.java
! src/share/classes/com/sun/tools/javap/ConstantWriter.java

Changeset: b6f95173e769
Author:    lana
Date:      2011-01-19 19:01 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/b6f95173e769

Merge


Changeset: 19c900c703c6
Author:    mcimadamore
Date:      2011-01-24 15:44 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/19c900c703c6

6943278: spurious error message for inference and type-variable with erroneous bound
Summary: type-inference should ignore erroneous bounds
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Type.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
+ test/tools/javac/generics/inference/6943278/T6943278.java
+ test/tools/javac/generics/inference/6943278/T6943278.out

Changeset: ce6175cfe11e
Author:    mcimadamore
Date:      2011-01-24 15:44 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/ce6175cfe11e

6968793: issues with diagnostics
Summary: several diagnostic improvements
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/6304921/T6304921.out
! test/tools/javac/6330920/T6330920.out
! test/tools/javac/6717241/T6717241a.out
! test/tools/javac/6717241/T6717241b.out
! test/tools/javac/6857948/T6857948.out
! test/tools/javac/6863465/T6863465c.out
! test/tools/javac/6863465/T6863465d.out
! test/tools/javac/T6247324.out
! test/tools/javac/TryWithResources/ResourceOutsideTry.out
! test/tools/javac/diags/examples.not-yet.txt
! test/tools/javac/diags/examples/CantResolve.java
! test/tools/javac/diags/examples/CantResolveArgsParams.java
! test/tools/javac/diags/examples/CantResolveLocation.java
! test/tools/javac/diags/examples/CantResolveLocationArgs.java
! test/tools/javac/diags/examples/CantResolveLocationArgsParams.java
- test/tools/javac/diags/examples/EnumConstRequired.java
! test/tools/javac/diags/examples/ForeachNotApplicable.java
! test/tools/javac/diags/examples/KindnameClass.java
! test/tools/javac/diags/examples/KindnameMethod.java
! test/tools/javac/diags/examples/KindnameVariable.java
+ test/tools/javac/diags/examples/Location.java
+ test/tools/javac/diags/examples/Location1.java
! test/tools/javac/diags/examples/OperatorCantBeApplied.java
+ test/tools/javac/diags/examples/OperatorCantBeApplied1.java
! test/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/StaticImportOnlyClassesAndInterfaces.java
! test/tools/javac/failover/FailOver01.out
! test/tools/javac/failover/FailOver02.out
! test/tools/javac/failover/FailOver04.out
! test/tools/javac/generics/6711619/T6711619a.out
! test/tools/javac/generics/diamond/neg/Neg01.out
! test/tools/javac/generics/diamond/neg/Neg02.out
! test/tools/javac/generics/diamond/neg/Neg03.out
! test/tools/javac/generics/diamond/neg/Neg04.out
! test/tools/javac/generics/diamond/neg/Neg11.out
! test/tools/javac/generics/inference/6943278/T6943278.out
! test/tools/javac/generics/typevars/5060485/Compatibility.out
! test/tools/javac/generics/typevars/5060485/Compatibility02.out
+ test/tools/javac/generics/typevars/6968793/T6968793.java
+ test/tools/javac/generics/typevars/6968793/T6968793.out
! test/tools/javac/policy/test1/byfile.ABD.out
! test/tools/javac/policy/test1/bytodo.ABD.out
! test/tools/javac/policy/test1/simple.ABD.out

Changeset: 02e6e7dd1a64
Author:    mcimadamore
Date:      2011-01-24 15:45 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/02e6e7dd1a64

6510286: Wording of javac error for inner classes
Summary: 'inner classes cannot have static declarations' message needs to be reworked
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/InnerNamedConstant_2.out

Changeset: 812c6251ea78
Author:    mcimadamore
Date:      2011-01-24 15:45 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/812c6251ea78

6569633: Varargs: parser error when varargs element type is an array
Summary: explicit error message when old-style array syntax is mixed with varargs
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
+ test/tools/javac/diags/examples/VarargsAndOldArraySyntax.java
+ test/tools/javac/varargs/6569633/T6569633.java
+ test/tools/javac/varargs/6569633/T6569633.out

Changeset: 57e3b9bc7fb8
Author:    mcimadamore
Date:      2011-01-24 15:45 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/57e3b9bc7fb8

7013865: varargs: javac crashes during overload resolution with generic varargs
Summary: fixed regression with varargs overload resolution that leads javac to crash
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Infer.java
+ test/tools/javac/varargs/T7013865.java

Changeset: 2314f2b07ae7
Author:    lana
Date:      2011-01-24 13:25 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/2314f2b07ae7

Merge

- src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java
- src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
- src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
- src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
- src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
- src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
- test/tools/javac/diags/examples/EnumConstRequired.java
- test/tools/javac/diags/examples/TypeParameterOnPolymorphicSignature.java
- test/tools/javac/meth/InvokeDynTrans.out
- test/tools/javac/meth/InvokeMHTrans.java
- test/tools/javac/meth/InvokeMHTrans.out

Changeset: d7225b476a5d
Author:    lana
Date:      2011-01-28 10:06 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/d7225b476a5d

Merge

- src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java
- src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
- src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
- src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
- src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
- src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
- test/tools/javac/diags/examples/EnumConstRequired.java
- test/tools/javac/diags/examples/TypeParameterOnPolymorphicSignature.java
- test/tools/javac/meth/InvokeDynTrans.out
- test/tools/javac/meth/InvokeMHTrans.java
- test/tools/javac/meth/InvokeMHTrans.out

Changeset: 1383d1ee8b5d
Author:    cl
Date:      2011-02-03 17:22 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/1383d1ee8b5d

Added tag jdk7-b128 for changeset d7225b476a5d

! .hgtags



From dlila at redhat.com  Mon Feb  7 06:23:29 2011
From: dlila at redhat.com (Denis Lila)
Date: Mon, 7 Feb 2011 09:23:29 -0500 (EST)
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <4D4C5E01.5050908@oracle.com>
Message-ID: <136157078.31605.1297088609026.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>

> Then that would be a problem. We'll have to figure out how to make
> them fail benignly if not run on a specific build (i.e. don't use
> internal rendering APIs). I'd hold off on putting these back for now...

I see. Ok, I'll think about a way to fix this. Perhaps before running
each test we could check that the implementation class we want exists
and is visible to us and if not simply print a warning?

In the meantime, I'll go ahead and push it without the tests.

Thank you,
Denis.

----- Original Message -----

> 
> ...jim
> 
> On 2/4/2011 6:02 AM, Denis Lila wrote:
> >> Do these also pass closed JDK? So far I don't know of any way to
> >> identify a test as "Open Rasterizer only"...
> >
> > I don't think so. When I run it with closed source java it
> > complains about no PathConsumer2D.
> >
> > ----- Original Message -----
> >
> >>
> >> ...jim
> >>
> >> On 2/3/2011 5:59 PM, Denis Lila wrote:
> >>> Hi Jim.
> >>>
> >>>> The code changes look good to go.
> >>>
> >>> Nice! Thanks.
> >>>
> >>>> I'm guessing there is no regression test for this as it is
> >>>> entirely
> >>>> performance. If this fixes any quality or correctness bugs it
> >>>> would
> >>>> be
> >>>> nice to develop an automated test case to go back with it, but if
> >>>> it
> >>>> is
> >>>> just performance then they don't usually have tests...
> >>>
> >>> This changeset would be entirely performance and I don't have a
> >>> test
> >>> for it. I do however have a few regression tests that I would like
> >>> to
> >>> push. They're already in icedtea:
> >>> http://icedtea.classpath.org/hg/icedtea6/file/12df222ab029/patches/rendering-engine-tests.patch
> >>> One of them doesn't have a sun bugid, so we should probably just
> >>> skip it.
> >>> I'm not sure how we would include them, since they all test bugs
> >>> that
> >>> have already been fixed.
> >>>
> >>> Regards,
> >>> Denis.


From dlila at redhat.com  Mon Feb  7 09:56:42 2011
From: dlila at redhat.com (Denis Lila)
Date: Mon, 7 Feb 2011 12:56:42 -0500 (EST)
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <136157078.31605.1297088609026.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
Message-ID: <216830722.43738.1297101402815.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>

Hi Jim.

> In the meantime, I'll go ahead and push it without the tests.

When I look for 7016856 in bugs.sun.com, nothing comes up. Should
I push anyway?

----- Original Message -----
> > Then that would be a problem. We'll have to figure out how to make
> > them fail benignly if not run on a specific build (i.e. don't use
> > internal rendering APIs). I'd hold off on putting these back for
> > now...
> 
> I see. Ok, I'll think about a way to fix this. Perhaps before running
> each test we could check that the implementation class we want exists
> and is visible to us and if not simply print a warning?
> 

> 
> Thank you,
> Denis.
> 
> ----- Original Message -----
> 
> >
> > ...jim
> >
> > On 2/4/2011 6:02 AM, Denis Lila wrote:
> > >> Do these also pass closed JDK? So far I don't know of any way to
> > >> identify a test as "Open Rasterizer only"...
> > >
> > > I don't think so. When I run it with closed source java it
> > > complains about no PathConsumer2D.
> > >
> > > ----- Original Message -----
> > >
> > >>
> > >> ...jim
> > >>
> > >> On 2/3/2011 5:59 PM, Denis Lila wrote:
> > >>> Hi Jim.
> > >>>
> > >>>> The code changes look good to go.
> > >>>
> > >>> Nice! Thanks.
> > >>>
> > >>>> I'm guessing there is no regression test for this as it is
> > >>>> entirely
> > >>>> performance. If this fixes any quality or correctness bugs it
> > >>>> would
> > >>>> be
> > >>>> nice to develop an automated test case to go back with it, but
> > >>>> if
> > >>>> it
> > >>>> is
> > >>>> just performance then they don't usually have tests...
> > >>>
> > >>> This changeset would be entirely performance and I don't have a
> > >>> test
> > >>> for it. I do however have a few regression tests that I would
> > >>> like
> > >>> to
> > >>> push. They're already in icedtea:
> > >>> http://icedtea.classpath.org/hg/icedtea6/file/12df222ab029/patches/rendering-engine-tests.patch
> > >>> One of them doesn't have a sun bugid, so we should probably just
> > >>> skip it.
> > >>> I'm not sure how we would include them, since they all test bugs
> > >>> that
> > >>> have already been fixed.
> > >>>
> > >>> Regards,
> > >>> Denis.


From james.graham at oracle.com  Mon Feb  7 16:56:30 2011
From: james.graham at oracle.com (Jim Graham)
Date: Mon, 07 Feb 2011 16:56:30 -0800
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <216830722.43738.1297101402815.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
References: <216830722.43738.1297101402815.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
Message-ID: <4D5094BE.6080802@oracle.com>

Odd, I searched on the bugid and didn't find it either.

I then struggled with a bunch of internal network problems before I was 
able to confirm that it is in the system internally so I tried searching 
on bugs.sun.com again and still didn't find it.

But, this link does seem to work, so it is in there, just not searchable 
for some reason:

http://bugs.sun.com/view_bug.do?bug_id=7016856

			...jim

On 2/7/2011 9:56 AM, Denis Lila wrote:
> Hi Jim.
>
>> In the meantime, I'll go ahead and push it without the tests.
>
> When I look for 7016856 in bugs.sun.com, nothing comes up. Should
> I push anyway?


From dlila at redhat.com  Tue Feb  8 06:19:56 2011
From: dlila at redhat.com (dlila at redhat.com)
Date: Tue, 08 Feb 2011 14:19:56 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 7016856: dashing performance was
	reduced during	latest changes to the OpenJDK rasterizer
Message-ID: <20110208142042.9A5C0474FA@hg.openjdk.java.net>

Changeset: 5e624003e622
Author:    dlila
Date:      2011-02-08 09:22 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/5e624003e622

7016856: dashing performance was reduced during latest changes to the OpenJDK rasterizer
Summary: Optimized dashing, rasterizing, and the flow of transformed coordinates
Reviewed-by: flar

! src/share/classes/sun/java2d/pisces/Curve.java
! src/share/classes/sun/java2d/pisces/Dasher.java
! src/share/classes/sun/java2d/pisces/Helpers.java
! src/share/classes/sun/java2d/pisces/PiscesCache.java
! src/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java
! src/share/classes/sun/java2d/pisces/PiscesTileGenerator.java
! src/share/classes/sun/java2d/pisces/Renderer.java
! src/share/classes/sun/java2d/pisces/Stroker.java
! src/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java



From dlila at redhat.com  Tue Feb  8 08:51:45 2011
From: dlila at redhat.com (Denis Lila)
Date: Tue, 8 Feb 2011 11:51:45 -0500 (EST)
Subject: [OpenJDK 2D-Dev] Fwd: CubicCurve2D.solveCubic and
 containment/intersection bugs.
In-Reply-To: <4D5094BE.6080802@oracle.com>
Message-ID: <1599004643.93684.1297183905338.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>

----- Original Message -----
> Odd, I searched on the bugid and didn't find it either.
> 
> I then struggled with a bunch of internal network problems before I
> was
> able to confirm that it is in the system internally so I tried
> searching
> on bugs.sun.com again and still didn't find it.
> 
> But, this link does seem to work, so it is in there, just not
> searchable
> for some reason:
> 
> http://bugs.sun.com/view_bug.do?bug_id=7016856
> 
> ...jim
> 

I see.

I pushed it.

Thanks for the review (and for writing part of it).
Denis.


From philip.race at oracle.com  Tue Feb  8 14:23:49 2011
From: philip.race at oracle.com (philip.race at oracle.com)
Date: Tue, 08 Feb 2011 22:23:49 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 7006865: Regression: Corrupted
	output when printing	images with bit depth of 4
Message-ID: <20110208222359.765DD47519@hg.openjdk.java.net>

Changeset: 7905b047a475
Author:    prr
Date:      2011-02-08 14:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/7905b047a475

7006865: Regression: Corrupted output when printing images with bit depth of 4
Reviewed-by: bae, jgodinez

! src/windows/classes/sun/awt/windows/WPathGraphics.java
! src/windows/classes/sun/awt/windows/WPrinterJob.java
+ test/java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java



From andrew.brygin at sun.com  Wed Feb  9 11:54:49 2011
From: andrew.brygin at sun.com (andrew.brygin at sun.com)
Date: Wed, 09 Feb 2011 19:54:49 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 6818960: ImageFetcher (
	MediaTracker) Thread leak
Message-ID: <20110209195501.AF9CC4755F@hg.openjdk.java.net>

Changeset: d42ce0b309ae
Author:    bae
Date:      2011-02-09 22:24 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/d42ce0b309ae

6818960: ImageFetcher (  MediaTracker) Thread leak
Reviewed-by: igor, prr

! src/share/classes/sun/awt/image/ImageFetcher.java
! src/share/classes/sun/awt/image/InputStreamImageSource.java



From philip.race at oracle.com  Wed Feb  9 14:33:33 2011
From: philip.race at oracle.com (philip.race at oracle.com)
Date: Wed, 09 Feb 2011 22:33:33 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 7018387: Xrender pipeline may
	leak GC's
Message-ID: <20110209223343.4C78A4756C@hg.openjdk.java.net>

Changeset: 37d20456c54c
Author:    ceisserer
Date:      2011-02-09 14:34 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/37d20456c54c

7018387: Xrender pipeline may leak GC's
Reviewed-by: prr

! src/solaris/classes/sun/java2d/xr/XRSurfaceData.java



From james.graham at oracle.com  Wed Feb  9 15:19:37 2011
From: james.graham at oracle.com (Jim Graham)
Date: Wed, 09 Feb 2011 15:19:37 -0800
Subject: [OpenJDK 2D-Dev] Java's definition of the SRC operator
In-Reply-To: <AANLkTikJ0u3NzJEhccwKyPgbDG5L5HA-FPLQu_A=J=NT@mail.gmail.com>
References: <AANLkTinvnQ4c0iC9NN6BOhn=etxSSNuuiYU5+x8OCwYm@mail.gmail.com>
	<4CCB1F2A.8070701@oracle.com>
	<AANLkTimuiOBxFZ8r6J1i4S9Fvqo0Gd=sf0=ES9AmooQo@mail.gmail.com>
	<AANLkTikJ0u3NzJEhccwKyPgbDG5L5HA-FPLQu_A=J=NT@mail.gmail.com>
Message-ID: <4D532109.9040505@oracle.com>

[Resending - I forgot to CC the list when I sent it originally...]

Hi Clemens,

What your code should do is draw either a black or a red line for the 
first (Src) case and then a red line for the second (SrcOver) case.

The black or red choice comes down to whether or not the opaque 
destination declares that it stores premultiplied data or not.  The 
results of the blend are in premultiplied space and so will be (1,0,0,1) 
out of 255 for the Src result.  That is then converted back into the 
"premultiplied or not" style of the destination and then stored without 
alpha.  Most, if not all, of our opaque destinations declare themselves 
as non-premultiplied so the result should be divided back out to (255, 
0, 0, 1) and then stored as red (modulo AA coverage calculations), but 
it seems like we have some bugs there.

If I run the code on screen I get a black line which would indicate that 
it is left in the premultiplied form even though the ColorModel says 
that it is non-premultiplied.  (I believe I am talking to the D3D 
pipeline there and I think we punted on this particular aspect of 
compatibility - we should be returning opaque colormodels that claim to 
be premultiplied, but we are not).  So, the screen gets it right except 
for agreeing with the premultiplied attribute of its ColorModel.

If I create a TYPE_INT_RGB BufferedImage then nothing is drawn which is 
a bug from my perspective regardless of premultiplied issues.

Neither case does what I think is the correct answer which is to store 
opaque red (modulated by AA coverage), though the screen is closer if it 
just returned the right answer from its ColorModel...

			...jim

On 11/2/2010 4:27 AM, Clemens Eisserer wrote:
> Hi Jim,
>
> I still don't understand why pixels without full aa coverage take the
> src's alpha into account.
> Is this intentional?
>
> Thanks, Clemens
>
>> Hi Jim,
>>
>>> blendresult = PORTER_DUFF(rule, rendercolor, dstcolor, extraalpha)
>>> // For SRC, blendresult = rendercolor modulated by extra alpha
>>> storedresult = INTERP(dstcolor, blendresult, aacoverage)
>>> // For full aa coverage, storedresult = blendresult
>>>
>>> The only part of this that could possibly be interpreted as "behaving like
>>> SRC_OVER" would be the second INTERP and it depends on the aa coverage, not
>>> on the alpha of the colors involved.  Is that what they were talking about?
>>
>> Thanks for the detailed explanation.
>>
>> What confuses me is that pixels wich don't have full AA coverage take
>> the src's alpha into the calculation.
>>
>> Shouldn't the following operations both yield the same result when
>> rendered to an opaque destination?
>>
>>       /*SRC*/
>>       g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC));
>>       g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);
>>       g2d.setColor(new Color(255, 0, 0, 1));
>>       g2d.drawLine(100, 120, 200, 220);
>>
>>       /*SRC_OVER*/
>>       g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
>>       g2d.setColor(Color.red);
>>       g2d.drawLine(100, 140, 200, 240);
>>
>> Thanks, Clemens
>>


From andrew.brygin at sun.com  Thu Feb 10 03:17:53 2011
From: andrew.brygin at sun.com (andrew.brygin at sun.com)
Date: Thu, 10 Feb 2011 11:17:53 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 6989774: imageio compiler
	warnings in native code
Message-ID: <20110210111846.0EBB3475A2@hg.openjdk.java.net>

Changeset: bcf663c292ef
Author:    bae
Date:      2011-02-10 13:44 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/bcf663c292ef

6989774: imageio compiler warnings in native code
Reviewed-by: igor, prr

! make/sun/jpeg/Makefile
! make/sun/jpeg/reorder-i586
! make/sun/jpeg/reorder-sparc
! make/sun/jpeg/reorder-sparcv9
! src/share/native/sun/awt/image/jpeg/imageioJPEG.c
! src/share/native/sun/awt/image/jpeg/jdmarker.c
! src/share/native/sun/awt/image/jpeg/jmemmgr.c
! src/share/native/sun/awt/image/jpeg/jmemnobs.c
! src/share/native/sun/awt/image/jpeg/jmemsys.h
! src/share/native/sun/awt/image/jpeg/jpegdecoder.c
! src/share/native/sun/awt/image/jpeg/jpeglib.h



From philip.race at oracle.com  Fri Feb 11 10:39:57 2011
From: philip.race at oracle.com (philip.race at oracle.com)
Date: Fri, 11 Feb 2011 18:39:57 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 7018364: XShmGetImage with
	image's > drawable's size	causes BadMatch
Message-ID: <20110211184037.AD9AB47678@hg.openjdk.java.net>

Changeset: 1881764c4cdf
Author:    prr
Date:      2011-02-11 10:40 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/1881764c4cdf

7018364: XShmGetImage with image's > drawable's size causes BadMatch
Reviewed-by: art, anthony
Contributed-by: linuxhippy at gmail.com

! src/solaris/native/sun/java2d/x11/X11SurfaceData.c
! src/solaris/native/sun/java2d/x11/X11SurfaceData.h



From dlila at redhat.com  Tue Feb 15 17:40:20 2011
From: dlila at redhat.com (Denis Lila)
Date: Tue, 15 Feb 2011 20:40:20 -0500 (EST)
Subject: [OpenJDK 2D-Dev] MT renderer
In-Reply-To: <1167512319.94653.1297818195890.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>
Message-ID: <2123821376.95822.1297820420382.JavaMail.root@zmail04.collab.prod.int.phx2.redhat.com>

Hi Jim,

Here's the first draft of the multithreading in pisces:
http://icedtea.classpath.org/~dlila/webrevs/MT/webrev/

There's 1-2 bugs in there somewhere. There's an OOB
in splitEdgesAtStrips which shouldn't be hard to fix,
and I saw an instance where I miss a crossing and the
whole line is filled (but I may have fixed this - I need
to run the tests again).

As for performance, the overhead right now is horrible,
but that's probably because on every frame we're creating
N threads, destroying them, creating N again, and destroying
them again. This can be fixed very easily by just making the
thread pool static and waiting for all the tasks to finish
by comparing the number of completed tasks to the number of
submitted tasks. There are some other things we can do to
reduce overhead, and I'm confident we can either make it
negligible (for small tasks) or make it so the gains from
parallelism offset it completely.

For large tasks, even the above implementation is very fast.
On a 2-core machine it takes about 65-75% of the time taken
by the single threaded version. I think the gains should
be roughly linear with the number of processors. I will
test on a 6 core machine to confirm this, and I'll update
you when I'm done.

If anyone else on this list has experience with parallel
computing, I'd love to hear your thoughts.

One more thing. I'm pretty sure I introduced a bug in
my last push. I already filed it. bugid: 7019861

Regards,
Denis.


From philip.race at oracle.com  Wed Feb 16 15:58:12 2011
From: philip.race at oracle.com (philip.race at oracle.com)
Date: Wed, 16 Feb 2011 23:58:12 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 7019441: No lookup cache for
	internal composite font	creation leads to java heap growth
Message-ID: <20110216235822.49FBD477F2@hg.openjdk.java.net>

Changeset: b04dafeda706
Author:    prr
Date:      2011-02-16 15:58 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/b04dafeda706

7019441: No lookup cache for internal composite font creation leads to java heap growth
Reviewed-by: igor, jgodinez

! src/share/classes/sun/font/FontUtilities.java



From andrew.brygin at oracle.com  Thu Feb 17 03:11:32 2011
From: andrew.brygin at oracle.com (andrew.brygin at oracle.com)
Date: Thu, 17 Feb 2011 11:11:32 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 7018912: [parfait] potential
	buffer overruns in	imageio jpeg
Message-ID: <20110217111200.04B754781C@hg.openjdk.java.net>

Changeset: e45f7d50dbc9
Author:    bae
Date:      2011-02-17 13:42 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/e45f7d50dbc9

7018912: [parfait] potential buffer overruns in imageio jpeg
Reviewed-by: jgodinez, prr

! src/share/native/sun/awt/image/jpeg/imageioJPEG.c



From philip.race at oracle.com  Fri Feb 18 09:13:51 2011
From: philip.race at oracle.com (philip.race at oracle.com)
Date: Fri, 18 Feb 2011 17:13:51 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 6857592: Getting warning while
	moving or resizing	the frame when component.printAll() is
	called on local JNI
Message-ID: <20110218171422.E5C234786B@hg.openjdk.java.net>

Changeset: 810445ab3099
Author:    prr
Date:      2011-02-18 09:14 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/810445ab3099

6857592: Getting warning while moving or resizing the frame when component.printAll() is called on local JNI
Reviewed-by: bae, flar

! src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp



From philip.race at oracle.com  Fri Feb 18 09:18:15 2011
From: philip.race at oracle.com (philip.race at oracle.com)
Date: Fri, 18 Feb 2011 17:18:15 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk:
	7017637:	closed/java/awt/font/StyledMetrics/BoldSpace.java
	failed :	Space char should have 0 advance
Message-ID: <20110218171825.2CA804786C@hg.openjdk.java.net>

Changeset: 5d8cfcb9a4e8
Author:    prr
Date:      2011-02-18 09:18 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/5d8cfcb9a4e8

7017637: closed/java/awt/font/StyledMetrics/BoldSpace.java failed : Space char should have 0 advance
Reviewed-by: igor, jgodinez

+ test/java/awt/font/StyledMetrics/BoldSpace.java



From jennifer.godinez at oracle.com  Fri Feb 18 12:11:20 2011
From: jennifer.godinez at oracle.com (jennifer.godinez at oracle.com)
Date: Fri, 18 Feb 2011 20:11:20 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 4 new changesets
Message-ID: <20110218201200.2C4E747876@hg.openjdk.java.net>

Changeset: 4c6500d20ebf
Author:    jgodinez
Date:      2011-02-04 11:46 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/4c6500d20ebf

7014796: Regression test java/awt/PrintJob/Text/stringwidth.sh cannot be terminated on Windows.
Reviewed-by: prr

! test/java/awt/PrintJob/Text/StringWidth.java

Changeset: 33cd780e8989
Author:    jgodinez
Date:      2011-02-04 11:48 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/33cd780e8989

6995147: Case needs to be update. ServiceDialogTest.java failed as compilation error.
Reviewed-by: prr

! test/javax/print/attribute/ServiceDialogTest.java

Changeset: 1d3f3c8d7ed5
Author:    jgodinez
Date:      2011-02-18 11:15 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/1d3f3c8d7ed5

6722351: sun.print.Win32PrintService.initMedia() is slow
Reviewed-by: igor, prr

! src/windows/classes/sun/print/Win32PrintService.java

Changeset: 059b56058cad
Author:    jgodinez
Date:      2011-02-18 12:04 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/059b56058cad

Merge

- make/java/hpi/Makefile
- make/java/hpi/hpi_common.gmk
- make/java/hpi/native/Makefile
- make/java/hpi/native/mapfile-vers
- make/java/hpi/native/reorder-i586
- make/java/hpi/native/reorder-sparc
- make/java/hpi/native/reorder-sparcv9
- make/java/hpi/windows/Makefile
- src/share/hpi/export/bool.h
- src/share/hpi/export/dll.h
- src/share/hpi/export/hpi.h
- src/share/hpi/include/hpi_impl.h
- src/share/hpi/include/vm_calls.h
- src/share/hpi/src/hpi.c
- src/solaris/hpi/export/byteorder_md.h
- src/solaris/hpi/export/hpi_md.h
- src/solaris/hpi/export/io_md.h
- src/solaris/hpi/export/path_md.h
- src/solaris/hpi/export/timeval_md.h
- src/solaris/hpi/include/hpi_init.h
- src/solaris/hpi/include/interrupt.h
- src/solaris/hpi/include/largefile.h
- src/solaris/hpi/include/largefile_linux.h
- src/solaris/hpi/include/largefile_solaris.h
- src/solaris/hpi/native_threads/include/condvar_md.h
- src/solaris/hpi/native_threads/include/monitor_md.h
- src/solaris/hpi/native_threads/include/mutex_md.h
- src/solaris/hpi/native_threads/include/np.h
- src/solaris/hpi/native_threads/include/porting.h
- src/solaris/hpi/native_threads/include/threads_md.h
- src/solaris/hpi/native_threads/src/condvar_md.c
- src/solaris/hpi/native_threads/src/interrupt_md.c
- src/solaris/hpi/native_threads/src/monitor_md.c
- src/solaris/hpi/native_threads/src/mutex_md.c
- src/solaris/hpi/native_threads/src/sys_api_td.c
- src/solaris/hpi/native_threads/src/threads_linux.c
- src/solaris/hpi/native_threads/src/threads_md.c
- src/solaris/hpi/native_threads/src/threads_solaris.c
- src/solaris/hpi/src/interrupt.c
- src/solaris/hpi/src/linker_md.c
- src/solaris/hpi/src/memory_md.c
- src/solaris/hpi/src/system_md.c
- src/windows/hpi/export/byteorder_md.h
- src/windows/hpi/export/hpi_md.h
- src/windows/hpi/export/io_md.h
- src/windows/hpi/export/path_md.h
- src/windows/hpi/export/timeval_md.h
- src/windows/hpi/include/monitor_md.h
- src/windows/hpi/include/mutex_md.h
- src/windows/hpi/include/threads_md.h
- src/windows/hpi/src/linker_md.c
- src/windows/hpi/src/memory_md.c
- src/windows/hpi/src/monitor_md.c
- src/windows/hpi/src/path_md.c
- src/windows/hpi/src/socket_md.c
- src/windows/hpi/src/sys_api_md.c
- src/windows/hpi/src/system_md.c
- src/windows/hpi/src/threads_md.c
- test/java/net/InetAddress/B4762344.java
- test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/InetAddress/Simple1NameServiceDescriptor.java
- test/java/net/InetAddress/Simple2NameServiceDescriptor.java
- test/java/net/InetAddress/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/B6442088.java
- test/sun/net/InetAddress/nameservice/CacheTest.java
- test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java



From jennifer.godinez at oracle.com  Fri Feb 18 13:53:26 2011
From: jennifer.godinez at oracle.com (jennifer.godinez at oracle.com)
Date: Fri, 18 Feb 2011 21:53:26 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 6850806: NPE exception throws
	in	PrintServce.getSupportedAttributeValues
Message-ID: <20110218215337.452324787F@hg.openjdk.java.net>

Changeset: 1acdde062e92
Author:    jgodinez
Date:      2011-02-18 13:47 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/1acdde062e92

6850806: NPE exception throws in PrintServce.getSupportedAttributeValues
Reviewed-by: igor, prr

! src/windows/classes/sun/print/Win32PrintService.java



From lana.steuck at oracle.com  Mon Feb 21 20:32:50 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Tue, 22 Feb 2011 04:32:50 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d: 5 new changesets
Message-ID: <20110222043250.7B15F47946@hg.openjdk.java.net>

Changeset: ce02c0d73d6a
Author:    ohair
Date:      2011-02-03 15:10 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/ce02c0d73d6a

7014634: By default, only build the product bits with a closed jdk build (like openjdk does)
Reviewed-by: katleman, cl, igor, trims

! make/Defs-internal.gmk

Changeset: e2a214ec8ebc
Author:    ohair
Date:      2011-02-04 07:47 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/e2a214ec8ebc

Merge


Changeset: a6b015b59fbc
Author:    ohair
Date:      2011-02-08 16:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/a6b015b59fbc

7016976: Documentation for required ant version  on JDK7 builds on Solaris 10 and Solaris 11
Reviewed-by: rinaldo

! README-builds.html

Changeset: cc58c11af154
Author:    cl
Date:      2011-02-10 16:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/cc58c11af154

Added tag jdk7-b129 for changeset a6b015b59fbc

! .hgtags

Changeset: 995077c73fbb
Author:    cl
Date:      2011-02-18 14:23 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/rev/995077c73fbb

Added tag jdk7-b130 for changeset cc58c11af154

! .hgtags



From lana.steuck at oracle.com  Mon Feb 21 20:32:58 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Tue, 22 Feb 2011 04:32:58 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jaxp: 2 new changesets
Message-ID: <20110222043258.91CCD47947@hg.openjdk.java.net>

Changeset: ab107c1bc4b9
Author:    cl
Date:      2011-02-10 16:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jaxp/rev/ab107c1bc4b9

Added tag jdk7-b129 for changeset f5b60c5a310f

! .hgtags

Changeset: f2ad604323c0
Author:    cl
Date:      2011-02-18 14:23 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jaxp/rev/f2ad604323c0

Added tag jdk7-b130 for changeset ab107c1bc4b9

! .hgtags



From lana.steuck at oracle.com  Mon Feb 21 20:33:01 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Tue, 22 Feb 2011 04:33:01 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jaxws: 2 new changesets
Message-ID: <20110222043301.5E5C047948@hg.openjdk.java.net>

Changeset: ba1fac1c2083
Author:    cl
Date:      2011-02-10 16:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jaxws/rev/ba1fac1c2083

Added tag jdk7-b129 for changeset 0f7b39ad9024

! .hgtags

Changeset: a8ffd75ad5df
Author:    cl
Date:      2011-02-18 14:23 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jaxws/rev/a8ffd75ad5df

Added tag jdk7-b130 for changeset ba1fac1c2083

! .hgtags



From lana.steuck at oracle.com  Mon Feb 21 20:32:53 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Tue, 22 Feb 2011 04:32:53 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/corba: 8 new changesets
Message-ID: <20110222043304.CC3A147949@hg.openjdk.java.net>

Changeset: 6a3903e5b6cc
Author:    ohair
Date:      2011-02-03 15:05 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/corba/rev/6a3903e5b6cc

6944304: Potential rebranding issues in the openjdk7/corba sources
Reviewed-by: alanb, mchung, darcy

! src/share/classes/com/sun/corba/se/spi/logging/data/Activation.mc
! src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc
! src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc
! src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc
! src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc
! src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc
! src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc
! src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc

Changeset: 66fa0fcc7792
Author:    ohair
Date:      2011-02-04 07:47 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/corba/rev/66fa0fcc7792

Merge


Changeset: 4cdf9b86f550
Author:    cl
Date:      2011-02-10 16:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/corba/rev/4cdf9b86f550

Added tag jdk7-b129 for changeset 66fa0fcc7792

! .hgtags

Changeset: 30ecf5c90a30
Author:    mfang
Date:      2011-02-10 11:07 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/corba/rev/30ecf5c90a30

7014477: pt_BR corba resource bundle is missing in jdk7 build
Reviewed-by: ohair

! make/common/Defs.gmk

Changeset: c08dff674e53
Author:    mfang
Date:      2011-02-10 14:25 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/corba/rev/c08dff674e53

7017734: jdk7 message drop 1 translation integration
Reviewed-by: ogino, yhuang

! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties
! src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties

Changeset: e0f0b358cd2c
Author:    mfang
Date:      2011-02-11 22:50 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/corba/rev/e0f0b358cd2c

Merge


Changeset: 563a8f8b5be3
Author:    mfang
Date:      2011-02-11 23:35 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/corba/rev/563a8f8b5be3

Merge


Changeset: 49a96611c870
Author:    cl
Date:      2011-02-18 14:23 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/corba/rev/49a96611c870

Added tag jdk7-b130 for changeset 563a8f8b5be3

! .hgtags



From lana.steuck at oracle.com  Mon Feb 21 20:33:14 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Tue, 22 Feb 2011 04:33:14 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/langtools: 30 new changesets
Message-ID: <20110222043415.2C83D4794A@hg.openjdk.java.net>

Changeset: 03e7fc380090
Author:    cl
Date:      2011-02-10 16:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/03e7fc380090

Added tag jdk7-b129 for changeset 1383d1ee8b5d

! .hgtags

Changeset: 73ab0b128918
Author:    jjg
Date:      2011-01-24 16:17 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/73ab0b128918

6963934: JCCompilationUnit.getImports does not report all imports
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/javac/tree/JCTree.java
+ test/tools/javac/tree/T6963934.java

Changeset: 22a040cbf0e0
Author:    jjg
Date:      2011-01-24 16:34 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/22a040cbf0e0

6581775: Fix the white space problem in javac shell tests
Reviewed-by: mcimadamore

! test/tools/javac/ClassPathTest/ClassPathTest.sh
! test/tools/javac/ExtDirs/ExtDirs.sh
! test/tools/javac/Paths/Help.sh
! test/tools/javac/javazip/Test.sh
! test/tools/javac/versions/check.sh

Changeset: a8437c34fdc7
Author:    jjg
Date:      2011-01-24 16:38 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/a8437c34fdc7

6988106: javac report 'java.lang.IllegalMonitorStateException'
Reviewed-by: ksrini

! src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java
! src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
! src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
+ src/share/classes/com/sun/tools/javac/file/ZipFileIndexCache.java
! test/tools/javac/T6725036.java

Changeset: 7f8794f9cc14
Author:    darcy
Date:      2011-01-25 17:02 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/7f8794f9cc14

7013420: Project Coin: remove general expression support from try-with-resources statement
Reviewed-by: mcimadamore, jjg

! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/TryWithResources/BadTwrSyntax.out
! test/tools/javac/TryWithResources/DuplicateResource.java
+ test/tools/javac/TryWithResources/ExplicitFinal.java
! test/tools/javac/TryWithResources/ImplicitFinal.java
! test/tools/javac/TryWithResources/ImplicitFinal.out
! test/tools/javac/TryWithResources/TwrFlow.java
! test/tools/javac/TryWithResources/TwrFlow.out
- test/tools/javac/TryWithResources/TwrInference.java
- test/tools/javac/TryWithResources/TwrIntersection.java
- test/tools/javac/TryWithResources/TwrIntersection02.java
- test/tools/javac/TryWithResources/TwrIntersection02.out
! test/tools/javac/TryWithResources/TwrMultiCatch.java
! test/tools/javac/TryWithResources/TwrOnNonResource.java
! test/tools/javac/TryWithResources/TwrOnNonResource.out
+ test/tools/javac/diags/examples/TryResourceTrailingSemi.java

Changeset: df371fd16386
Author:    jjg
Date:      2011-01-26 11:20 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/df371fd16386

6554097: "final" confuses @SuppressWarnings
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/javac/code/Symbol.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+ test/tools/javac/T6554097.java
+ test/tools/javac/T6554097.out

Changeset: 3da26790ccb7
Author:    jjg
Date:      2011-01-26 13:45 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/3da26790ccb7

7013272: Automatically generate info about how compiler resource keys are used
Reviewed-by: mcimadamore

! make/build.xml
! src/share/classes/com/sun/tools/javac/code/Printer.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
+ test/tools/javac/diags/ArgTypeCompilerFactory.java
! test/tools/javac/diags/Example.java
+ test/tools/javac/diags/MessageFile.java
+ test/tools/javac/diags/MessageInfo.java
! test/tools/javac/diags/RunExamples.java

Changeset: 92ab09ed59fd
Author:    jjh
Date:      2011-01-28 00:09 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/92ab09ed59fd

7015482: jtreg test tools/javac/diags/MessageInfo.java fails when test/ dir is not in langtools repo
Summary: Don't fail if the needed file isn't present, if running under jtreg.
Reviewed-by: jjg

! test/tools/javac/diags/MessageInfo.java

Changeset: 2088e674f0e0
Author:    mcimadamore
Date:      2011-01-28 12:01 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/2088e674f0e0

6910550: javac 1.5.0_17 fails with incorrect error message
Summary: multiple clashing members declared in same class should be added to the class' scope in order to avoid downstream spurious diagnostics
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Flags.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
+ test/tools/javac/generics/6910550/T6910550a.java
+ test/tools/javac/generics/6910550/T6910550a.out
+ test/tools/javac/generics/6910550/T6910550b.java
+ test/tools/javac/generics/6910550/T6910550b.out
+ test/tools/javac/generics/6910550/T6910550c.java
+ test/tools/javac/generics/6910550/T6910550c.out
+ test/tools/javac/generics/6910550/T6910550d.java
+ test/tools/javac/generics/6910550/T6910550d.out
+ test/tools/javac/generics/6910550/T6910550e.java
+ test/tools/javac/generics/6910550/T6910550e.out

Changeset: 5a43b245aed1
Author:    mcimadamore
Date:      2011-01-28 12:03 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/5a43b245aed1

6313164: javac generates code that fails byte code verification for the varargs feature
Summary: method applicability check should fail if formal varargs element type is not accessible
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Infer.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/diags/examples.not-yet.txt
+ test/tools/javac/diags/examples/InaccessibleVarargsType/InaccessibleVarargsType.java
+ test/tools/javac/diags/examples/InaccessibleVarargsType/p1/A.java
+ test/tools/javac/diags/examples/InaccessibleVarargsType/p1/B.java
! test/tools/javac/generics/inference/6638712/T6638712c.out
! test/tools/javac/generics/inference/6638712/T6638712d.out
+ test/tools/javac/varargs/6313164/T6313164.java
+ test/tools/javac/varargs/6313164/T6313164.out
+ test/tools/javac/varargs/6313164/p1/A.java
+ test/tools/javac/varargs/6313164/p1/B.java
+ test/tools/javac/varargs/6313164/p1/C.java

Changeset: 17bafae67e9d
Author:    mcimadamore
Date:      2011-01-28 12:06 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/17bafae67e9d

6838943: inference: javac is not handling type-variable substitution properly
Summary: free type-variables are being replaced with type-variables bound to forall type leading to unsoundness
Reviewed-by: jjg, dlsmith

! src/share/classes/com/sun/tools/javac/code/Types.java
+ test/tools/javac/generics/inference/6838943/T6838943.java
+ test/tools/javac/generics/inference/6838943/T6838943.out

Changeset: babf86a1ac92
Author:    alanb
Date:      2011-01-28 09:25 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/babf86a1ac92

7006126: (fs) Updates to file system API (1/2011)
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java
! src/share/classes/com/sun/tools/javac/nio/PathFileObject.java
! test/tools/javac/nio/compileTest/CompileTest.java

Changeset: df3394337b04
Author:    alanb
Date:      2011-01-28 12:36 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/df3394337b04

Merge


Changeset: 7a75a1803c7a
Author:    darcy
Date:      2011-01-28 16:54 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/7a75a1803c7a

7015530: Reiterate API specializations in javax.lang.model.elment subinterfaces
Reviewed-by: jjg

! src/share/classes/javax/lang/model/element/Element.java
! src/share/classes/javax/lang/model/element/ExecutableElement.java
! src/share/classes/javax/lang/model/element/PackageElement.java
! src/share/classes/javax/lang/model/element/TypeElement.java
! src/share/classes/javax/lang/model/element/TypeParameterElement.java
! src/share/classes/javax/lang/model/element/VariableElement.java

Changeset: 2ab47c4cd618
Author:    darcy
Date:      2011-01-31 19:06 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/2ab47c4cd618

7014734: Project Coin: Allow optional trailing semicolon to terminate resources list in try-with-resources
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/TryWithResources/BadTwrSyntax.java
! test/tools/javac/TryWithResources/BadTwrSyntax.out
- test/tools/javac/diags/examples/TryResourceTrailingSemi.java

Changeset: cad51b6eb7a6
Author:    darcy
Date:      2011-02-01 10:11 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/cad51b6eb7a6

6961571: Update visitors to support ARM's ElementKind.RESOURCE_VARIABLE
Reviewed-by: jjg

+ src/share/classes/javax/lang/model/type/DisjunctiveType.java
! src/share/classes/javax/lang/model/type/TypeKind.java
! src/share/classes/javax/lang/model/type/TypeVisitor.java
! src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
! src/share/classes/javax/lang/model/util/AbstractTypeVisitor7.java
! src/share/classes/javax/lang/model/util/ElementKindVisitor6.java
! src/share/classes/javax/lang/model/util/ElementKindVisitor7.java
! src/share/classes/javax/lang/model/util/ElementScanner6.java
! src/share/classes/javax/lang/model/util/ElementScanner7.java
! src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java
! src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
! src/share/classes/javax/lang/model/util/SimpleElementVisitor7.java
! src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
! src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java
! src/share/classes/javax/lang/model/util/TypeKindVisitor7.java
! src/share/classes/javax/lang/model/util/Types.java
! test/tools/javac/processing/model/element/TestResourceVariable.java

Changeset: 899f7c3d9426
Author:    mcimadamore
Date:      2011-02-03 09:35 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/899f7c3d9426

6594914: @SuppressWarnings("deprecation") does not not work for the type of a variable
Summary: Lint warnings generated during MemberEnter might ignore @SuppressWarnings annotations
Reviewed-by: jjg

+ src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
+ test/tools/javac/warnings/6594914/DeprecatedClass.java
+ test/tools/javac/warnings/6594914/T6594914a.java
+ test/tools/javac/warnings/6594914/T6594914a.out
+ test/tools/javac/warnings/6594914/T6594914b.java
+ test/tools/javac/warnings/6594914/T6594914b.out

Changeset: 875262e89b52
Author:    mcimadamore
Date:      2011-02-03 09:36 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/875262e89b52

5017953: spurious cascaded diagnostics when name not found
Summary: when an operator is applied to one or more erroneous operands, spurious diagnostics are generated
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
+ test/tools/javac/5017953/T5017953.java
+ test/tools/javac/5017953/T5017953.out
! test/tools/javac/6491592/T6491592.out

Changeset: 03cf47d4de15
Author:    mcimadamore
Date:      2011-02-03 09:37 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/03cf47d4de15

6969184: poor error recovery after symbol not found
Summary: generic type-well formedness check should ignore erroneous symbols
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Check.java
+ test/tools/javac/generics/6969184/T6969184.java
+ test/tools/javac/generics/6969184/T6969184.out

Changeset: afe226180744
Author:    mcimadamore
Date:      2011-02-03 09:38 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/afe226180744

7014715: javac returns different error code for certain failure(s)
Summary: javac silently crashes when emitting certain kinds of resolution diagnostics
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Resolve.java
! test/tools/javac/AnonStaticMember_2.java
+ test/tools/javac/AnonStaticMember_2.out
! test/tools/javac/InterfaceInInner.java
+ test/tools/javac/InterfaceInInner.out
! test/tools/javac/QualifiedNew.java
+ test/tools/javac/QualifiedNew.out
! test/tools/javac/T6247324.out
! test/tools/javac/generics/diamond/neg/Neg01.out
! test/tools/javac/generics/inference/6943278/T6943278.out

Changeset: 9e6a09375d37
Author:    lana
Date:      2011-02-04 17:30 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/9e6a09375d37

Merge


Changeset: 3aa269645199
Author:    mcimadamore
Date:      2011-02-07 18:09 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/3aa269645199

7017414: before the move of JSR 292 to package java.lang.invoke, javac must recognize the new package
Summary: added support for future 292 package (support for old location 'java.dyn' will be removed in followup changeset)
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Flags.java
! src/share/classes/com/sun/tools/javac/code/Symtab.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/util/Names.java

Changeset: 96d4226bdd60
Author:    mcimadamore
Date:      2011-02-07 18:10 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/96d4226bdd60

7007615: java_util/generics/phase2/NameClashTest02 fails since jdk7/pit/b123.
Summary: override clash algorithm is not implemented correctly
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/code/Scope.java
! src/share/classes/com/sun/tools/javac/code/Symbol.java
! src/share/classes/com/sun/tools/javac/code/Symtab.java
! src/share/classes/com/sun/tools/javac/code/Types.java
! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/comp/Enter.java
! src/share/classes/com/sun/tools/javac/comp/Lower.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
+ test/tools/javac/diags/examples/NameClashSameErasureNoHide.java
! test/tools/javac/diags/examples/NameClashSameErasureNoOverride.java
+ test/tools/javac/diags/examples/NameClashSameErasureNoOverride1.java
! test/tools/javac/generics/5009937/T5009937.out
! test/tools/javac/generics/6182950/T6182950b.out
! test/tools/javac/generics/6476118/T6476118a.out
! test/tools/javac/generics/6476118/T6476118b.out
! test/tools/javac/generics/6476118/T6476118c.java
! test/tools/javac/generics/6476118/T6476118c.out
! test/tools/javac/generics/6985719/T6985719e.out
! test/tools/javac/generics/6985719/T6985719f.out
! test/tools/javac/generics/6985719/T6985719g.out
! test/tools/javac/generics/6985719/T6985719h.out
+ test/tools/javac/generics/7007615/T7007615.java
+ test/tools/javac/generics/7007615/T7007615.out
+ test/tools/javac/generics/7007615/acc1/AccessibilityCheck01.java
+ test/tools/javac/generics/7007615/acc1/p1/C.java
+ test/tools/javac/generics/7007615/acc1/p1/D.java
+ test/tools/javac/generics/7007615/acc1/p2/E.java
+ test/tools/javac/generics/7007615/acc2/AccessibilityCheck02.java
+ test/tools/javac/generics/7007615/acc2/AccessibilityCheck02.out
+ test/tools/javac/generics/7007615/acc2/p1/C.java
+ test/tools/javac/generics/7007615/acc2/p1/D.java
+ test/tools/javac/generics/7007615/acc2/p2/E.java
! test/tools/javac/scope/HashCollisionTest.java
! test/tools/javac/scope/StarImportTest.java

Changeset: 56b77a38618c
Author:    jjg
Date:      2011-02-07 11:42 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/56b77a38618c

7017675: typo in JavacParser for allowUnderscoresInLiterals
Reviewed-by: dlsmith
Contributed-by: peter.b.kessler at oracle.com

! src/share/classes/com/sun/tools/javac/parser/Scanner.java

Changeset: 2cbaa43eb075
Author:    lana
Date:      2011-02-14 16:31 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/2cbaa43eb075

Merge

- test/tools/javac/TryWithResources/TwrInference.java
- test/tools/javac/TryWithResources/TwrIntersection.java
- test/tools/javac/TryWithResources/TwrIntersection02.java
- test/tools/javac/TryWithResources/TwrIntersection02.out

Changeset: a21c7f194d31
Author:    mfang
Date:      2011-02-10 16:51 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/a21c7f194d31

7017734: jdk7 message drop 1 translation integration
Reviewed-by: ogino, yhuang

! src/share/classes/com/sun/tools/apt/resources/apt_ja.properties
! src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties
! src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties
! src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties
! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties
! src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties
! src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties
! src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties
! src/share/classes/com/sun/tools/javac/resources/javac_ja.properties
! src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
! src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties
! src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties
! src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties
! src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties

Changeset: 4cdea0752a48
Author:    mfang
Date:      2011-02-11 22:58 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/4cdea0752a48

Merge


Changeset: 26071d11c613
Author:    mfang
Date:      2011-02-11 23:49 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/26071d11c613

Merge


Changeset: 7a98db8cbfce
Author:    ohair
Date:      2011-02-15 12:34 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/7a98db8cbfce

Merge


Changeset: 6cdb76cf4d1a
Author:    cl
Date:      2011-02-18 14:23 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/langtools/rev/6cdb76cf4d1a

Added tag jdk7-b130 for changeset 7a98db8cbfce

! .hgtags



From lana.steuck at oracle.com  Mon Feb 21 20:33:19 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Tue, 22 Feb 2011 04:33:19 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/hotspot: 47 new changesets
Message-ID: <20110222043444.EF3F34794B@hg.openjdk.java.net>

Changeset: 6aa467001334
Author:    trims
Date:      2011-01-25 14:57 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/6aa467001334

Added tag hs20-b07 for changeset d535bf4c1235

! .hgtags

Changeset: d19d8218a399
Author:    trims
Date:      2011-01-25 15:06 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/d19d8218a399

7014711: Fork HS20 to HS21 - renumber Major and build numbers of JVM
Summary: Update the Major and Build numbers for HS21
Reviewed-by: jcoomes

! make/hotspot_version

Changeset: ccfcb502af3f
Author:    dholmes
Date:      2011-01-25 00:14 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/ccfcb502af3f

6566340: Restore use of stillborn flag to signify a thread that was stopped before it started
Summary: Restore use of stillborn flag
Reviewed-by: acorn, alanb

! src/share/vm/prims/jvm.cpp
! src/share/vm/runtime/thread.cpp

Changeset: 515cc1a31fd1
Author:    dcubed
Date:      2011-01-26 21:26 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/515cc1a31fd1

Merge


Changeset: bb2c2878f134
Author:    twisti
Date:      2011-01-20 08:25 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/bb2c2878f134

7011839: JSR 292 turn on escape analysis when using invokedynamic
Summary: Currently escape analysis is turned off when EnableInvokeDynamic is true.
Reviewed-by: jrose, kvn

! src/share/vm/ci/bcEscapeAnalyzer.cpp
! src/share/vm/runtime/arguments.cpp

Changeset: a7367756024b
Author:    twisti
Date:      2011-01-21 01:16 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/a7367756024b

Merge

! src/share/vm/ci/bcEscapeAnalyzer.cpp
- src/share/vm/gc_implementation/g1/concurrentZFThread.cpp
- src/share/vm/gc_implementation/g1/concurrentZFThread.hpp

Changeset: 403dc4c1d7f5
Author:    never
Date:      2011-01-21 13:01 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/403dc4c1d7f5

6809483: hotspot:::method_entry are not correctly generated for "method()V"
Reviewed-by: iveresov, twisti

! src/share/vm/c1/c1_Canonicalizer.cpp
! src/share/vm/c1/c1_Canonicalizer.hpp
! src/share/vm/c1/c1_GraphBuilder.cpp
! src/share/vm/c1/c1_Instruction.hpp
! src/share/vm/c1/c1_InstructionPrinter.cpp
! src/share/vm/c1/c1_InstructionPrinter.hpp
! src/share/vm/c1/c1_LIRGenerator.cpp
! src/share/vm/c1/c1_LIRGenerator.hpp
! src/share/vm/c1/c1_Optimizer.cpp
! src/share/vm/c1/c1_ValueMap.hpp

Changeset: aa4b04b68652
Author:    never
Date:      2011-01-21 13:03 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/aa4b04b68652

Merge

! src/share/vm/c1/c1_GraphBuilder.cpp
! src/share/vm/c1/c1_LIRGenerator.cpp

Changeset: e4fee0bdaa85
Author:    never
Date:      2011-01-24 13:34 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/e4fee0bdaa85

7008809: should report the class in ArrayStoreExceptions from compiled code
Reviewed-by: iveresov, twisti

! src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
! src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
! src/cpu/x86/vm/c1_CodeStubs_x86.cpp
! src/cpu/x86/vm/c1_Runtime1_x86.cpp
! src/share/vm/c1/c1_CodeStubs.hpp
! src/share/vm/c1/c1_LIR.cpp
! src/share/vm/c1/c1_Runtime1.cpp
! src/share/vm/c1/c1_Runtime1.hpp

Changeset: f966c66b5463
Author:    iveresov
Date:      2011-01-25 14:38 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/f966c66b5463

7014247: CTW fails when compile sun/misc/AtomicLongCSImpl (REMOVED from JDK7)
Summary: Use lea to compute field address in AtomicLongCSImpl::attemptUpdate() intrinsic on x86.
Reviewed-by: never, kvn

! src/cpu/x86/vm/c1_LIRGenerator_x86.cpp

Changeset: 635b068a7224
Author:    twisti
Date:      2011-01-27 08:47 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/635b068a7224

Merge

! src/cpu/sparc/vm/c1_Runtime1_sparc.cpp

Changeset: 9846d99e16d3
Author:    twisti
Date:      2011-01-27 14:05 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/9846d99e16d3

Merge


Changeset: a672e43650cc
Author:    tonyp
Date:      2011-01-21 11:30 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/a672e43650cc

7013718: G1: small fixes for two assert/guarantee failures
Summary: Two small fixes to deal with a guarantee failure (the marking thread should join the SuspendibleThreadSet before calling a method that does pause prediction work so that said method is never called during a pause) and an assert failure (an assert is too strong).
Reviewed-by: iveresov, johnc

! src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
! src/share/vm/gc_implementation/g1/heapRegionSeq.cpp

Changeset: 97ba643ea3ed
Author:    tonyp
Date:      2011-01-25 17:58 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/97ba643ea3ed

7014261: G1: RSet-related failures
Summary: A race between the concurrent cleanup thread and the VM thread while it is processing the "expanded sparse table list" causes both threads to try to free the same sparse table entry and either causes one of the threads to fail or leaves the entry in an inconsistent state. The solution is purge all entries on the expanded list that correspond go regions that are being cleaned up.
Reviewed-by: brutisso, johnc

! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
! src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
! src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp
! src/share/vm/gc_implementation/g1/sparsePRT.cpp
! src/share/vm/gc_implementation/g1/sparsePRT.hpp

Changeset: 234761c55641
Author:    johnc
Date:      2011-01-25 10:56 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/234761c55641

6608385: G1: need to support parallel reference processing
Summary: Implement support for ParallelRefProcEnabled in the reference processing that takes place at the end of G1 concurrent marking.
Reviewed-by: tonyp, ysr

! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/gc_implementation/g1/concurrentMark.hpp
! src/share/vm/gc_implementation/g1/g1_globals.hpp
! src/share/vm/runtime/arguments.cpp

Changeset: 81668b1f4877
Author:    johnc
Date:      2011-01-26 09:57 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/81668b1f4877

Merge

! src/share/vm/gc_implementation/g1/concurrentMark.cpp

Changeset: 27e4ea99855d
Author:    johnc
Date:      2011-01-27 13:42 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/27e4ea99855d

Merge

! src/share/vm/runtime/arguments.cpp

Changeset: 3582bf76420e
Author:    coleenp
Date:      2011-01-27 16:11 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/3582bf76420e

6990754: Use native memory and reference counting to implement SymbolTable
Summary: move symbols from permgen into C heap and reference count them
Reviewed-by: never, acorn, jmasa, stefank

! agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java
! agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java
! agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java
! agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java
! agent/src/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java
! agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintEntry.java
! agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderEntry.java
! agent/src/share/classes/sun/jvm/hotspot/memory/StringTable.java
! agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java
! agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
! agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java
! agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
! agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java
! agent/src/share/classes/sun/jvm/hotspot/oops/Method.java
! agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java
! agent/src/share/classes/sun/jvm/hotspot/oops/Symbol.java
- agent/src/share/classes/sun/jvm/hotspot/oops/SymbolKlass.java
! agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java
! agent/src/share/classes/sun/jvm/hotspot/types/Field.java
! agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java
! agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java
! agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java
! agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java
! src/cpu/sparc/vm/sharedRuntime_sparc.cpp
! src/cpu/x86/vm/sharedRuntime_x86_32.cpp
! src/cpu/x86/vm/sharedRuntime_x86_64.cpp
! src/os/solaris/dtrace/generateJvmOffsets.cpp
! src/os/solaris/dtrace/jhelper.d
! src/os/solaris/dtrace/libjvm_db.c
! src/os/solaris/vm/dtraceJSDT_solaris.cpp
! src/share/vm/ci/ciClassList.hpp
! src/share/vm/ci/ciEnv.cpp
! src/share/vm/ci/ciEnv.hpp
! src/share/vm/ci/ciField.cpp
! src/share/vm/ci/ciInstanceKlass.cpp
! src/share/vm/ci/ciKlass.cpp
! src/share/vm/ci/ciMethod.cpp
! src/share/vm/ci/ciObjArrayKlass.cpp
! src/share/vm/ci/ciObject.hpp
! src/share/vm/ci/ciObjectFactory.cpp
! src/share/vm/ci/ciObjectFactory.hpp
! src/share/vm/ci/ciSignature.cpp
! src/share/vm/ci/ciSignature.hpp
! src/share/vm/ci/ciSymbol.cpp
! src/share/vm/ci/ciSymbol.hpp
- src/share/vm/ci/ciSymbolKlass.cpp
- src/share/vm/ci/ciSymbolKlass.hpp
! src/share/vm/ci/compilerInterface.hpp
! src/share/vm/classfile/classFileError.cpp
! src/share/vm/classfile/classFileParser.cpp
! src/share/vm/classfile/classFileParser.hpp
! src/share/vm/classfile/classLoader.cpp
! src/share/vm/classfile/classLoader.hpp
! src/share/vm/classfile/dictionary.cpp
! src/share/vm/classfile/dictionary.hpp
! src/share/vm/classfile/javaAssertions.cpp
! src/share/vm/classfile/javaClasses.cpp
! src/share/vm/classfile/javaClasses.hpp
! src/share/vm/classfile/loaderConstraints.cpp
! src/share/vm/classfile/loaderConstraints.hpp
! src/share/vm/classfile/placeholders.cpp
! src/share/vm/classfile/placeholders.hpp
! src/share/vm/classfile/resolutionErrors.cpp
! src/share/vm/classfile/resolutionErrors.hpp
! src/share/vm/classfile/stackMapFrame.cpp
! src/share/vm/classfile/stackMapFrame.hpp
! src/share/vm/classfile/stackMapTable.cpp
! src/share/vm/classfile/symbolTable.cpp
! src/share/vm/classfile/symbolTable.hpp
! src/share/vm/classfile/systemDictionary.cpp
! src/share/vm/classfile/systemDictionary.hpp
! src/share/vm/classfile/verificationType.cpp
! src/share/vm/classfile/verificationType.hpp
! src/share/vm/classfile/verifier.cpp
! src/share/vm/classfile/verifier.hpp
! src/share/vm/classfile/vmSymbols.cpp
! src/share/vm/classfile/vmSymbols.hpp
! src/share/vm/code/compiledIC.cpp
! src/share/vm/code/dependencies.cpp
! src/share/vm/code/nmethod.cpp
! src/share/vm/compiler/compileBroker.cpp
! src/share/vm/compiler/compileLog.hpp
! src/share/vm/compiler/compilerOracle.cpp
! src/share/vm/compiler/compilerOracle.hpp
! src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_implementation/g1/concurrentMark.cpp
! src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
! src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
! src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp
! src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
! src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
! src/share/vm/gc_implementation/shared/concurrentGCThread.cpp
! src/share/vm/gc_implementation/shared/markSweep.cpp
! src/share/vm/interpreter/bytecode.cpp
! src/share/vm/interpreter/bytecode.hpp
! src/share/vm/interpreter/bytecodeTracer.cpp
! src/share/vm/interpreter/interpreter.cpp
! src/share/vm/interpreter/interpreterRuntime.cpp
! src/share/vm/interpreter/linkResolver.cpp
! src/share/vm/interpreter/linkResolver.hpp
! src/share/vm/memory/classify.cpp
! src/share/vm/memory/compactingPermGenGen.cpp
! src/share/vm/memory/compactingPermGenGen.hpp
! src/share/vm/memory/dump.cpp
! src/share/vm/memory/genCollectedHeap.cpp
! src/share/vm/memory/genMarkSweep.cpp
! src/share/vm/memory/heapInspection.cpp
! src/share/vm/memory/iterator.hpp
! src/share/vm/memory/oopFactory.hpp
! src/share/vm/memory/restore.cpp
! src/share/vm/memory/serialize.cpp
! src/share/vm/memory/sharedHeap.cpp
! src/share/vm/memory/universe.cpp
! src/share/vm/memory/universe.hpp
! src/share/vm/oops/arrayKlass.cpp
! src/share/vm/oops/arrayKlass.hpp
! src/share/vm/oops/arrayOop.cpp
! src/share/vm/oops/constantPoolKlass.cpp
! src/share/vm/oops/constantPoolOop.cpp
! src/share/vm/oops/constantPoolOop.hpp
! src/share/vm/oops/generateOopMap.cpp
! src/share/vm/oops/generateOopMap.hpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp
! src/share/vm/oops/instanceKlassKlass.cpp
! src/share/vm/oops/klass.cpp
! src/share/vm/oops/klass.hpp
! src/share/vm/oops/klassKlass.cpp
! src/share/vm/oops/klassVtable.cpp
! src/share/vm/oops/klassVtable.hpp
! src/share/vm/oops/markOop.hpp
! src/share/vm/oops/methodKlass.cpp
! src/share/vm/oops/methodOop.cpp
! src/share/vm/oops/methodOop.hpp
! src/share/vm/oops/objArrayKlass.cpp
! src/share/vm/oops/objArrayKlassKlass.cpp
! src/share/vm/oops/oop.hpp
! src/share/vm/oops/oop.inline.hpp
! src/share/vm/oops/oopsHierarchy.hpp
+ src/share/vm/oops/symbol.cpp
+ src/share/vm/oops/symbol.hpp
- src/share/vm/oops/symbolKlass.cpp
- src/share/vm/oops/symbolKlass.hpp
- src/share/vm/oops/symbolOop.cpp
- src/share/vm/oops/symbolOop.hpp
! src/share/vm/oops/typeArrayKlass.cpp
! src/share/vm/opto/runtime.cpp
! src/share/vm/precompiled.hpp
! src/share/vm/prims/jni.cpp
! src/share/vm/prims/jniCheck.cpp
! src/share/vm/prims/jvm.cpp
! src/share/vm/prims/jvm_misc.hpp
! src/share/vm/prims/jvmtiClassFileReconstituter.cpp
! src/share/vm/prims/jvmtiClassFileReconstituter.hpp
! src/share/vm/prims/jvmtiEnv.cpp
! src/share/vm/prims/jvmtiEnvBase.cpp
! src/share/vm/prims/jvmtiExport.cpp
! src/share/vm/prims/jvmtiExport.hpp
! src/share/vm/prims/jvmtiImpl.cpp
! src/share/vm/prims/jvmtiRedefineClasses.cpp
! src/share/vm/prims/jvmtiRedefineClasses.hpp
! src/share/vm/prims/jvmtiTagMap.cpp
! src/share/vm/prims/methodComparator.cpp
! src/share/vm/prims/methodHandleWalk.cpp
! src/share/vm/prims/methodHandleWalk.hpp
! src/share/vm/prims/methodHandles.cpp
! src/share/vm/prims/methodHandles.hpp
! src/share/vm/prims/nativeLookup.cpp
! src/share/vm/prims/unsafe.cpp
! src/share/vm/runtime/deoptimization.cpp
! src/share/vm/runtime/fieldDescriptor.hpp
! src/share/vm/runtime/fieldType.cpp
! src/share/vm/runtime/fieldType.hpp
! src/share/vm/runtime/fprofiler.cpp
! src/share/vm/runtime/frame.cpp
! src/share/vm/runtime/frame.hpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/handles.hpp
! src/share/vm/runtime/interfaceSupport.cpp
! src/share/vm/runtime/interfaceSupport.hpp
! src/share/vm/runtime/java.cpp
! src/share/vm/runtime/java.hpp
! src/share/vm/runtime/javaCalls.cpp
! src/share/vm/runtime/javaCalls.hpp
! src/share/vm/runtime/objectMonitor.cpp
! src/share/vm/runtime/os.cpp
! src/share/vm/runtime/reflection.cpp
! src/share/vm/runtime/reflection.hpp
! src/share/vm/runtime/reflectionUtils.hpp
! src/share/vm/runtime/rframe.cpp
! src/share/vm/runtime/safepoint.cpp
! src/share/vm/runtime/sharedRuntime.cpp
! src/share/vm/runtime/sharedRuntime.hpp
! src/share/vm/runtime/signature.cpp
! src/share/vm/runtime/signature.hpp
! src/share/vm/runtime/statSampler.cpp
! src/share/vm/runtime/synchronizer.cpp
! src/share/vm/runtime/thread.cpp
! src/share/vm/runtime/vframe.cpp
! src/share/vm/runtime/vmStructs.cpp
! src/share/vm/runtime/vmStructs.hpp
! src/share/vm/runtime/vm_operations.cpp
! src/share/vm/runtime/vm_operations.hpp
! src/share/vm/services/attachListener.cpp
! src/share/vm/services/classLoadingService.cpp
! src/share/vm/services/heapDumper.cpp
! src/share/vm/services/lowMemoryDetector.cpp
! src/share/vm/services/management.cpp
! src/share/vm/services/management.hpp
! src/share/vm/services/memoryManager.cpp
! src/share/vm/services/memoryPool.cpp
! src/share/vm/services/memoryService.cpp
! src/share/vm/services/threadService.cpp
! src/share/vm/utilities/debug.cpp
! src/share/vm/utilities/debug.hpp
! src/share/vm/utilities/exceptions.cpp
! src/share/vm/utilities/exceptions.hpp
! src/share/vm/utilities/hashtable.cpp
! src/share/vm/utilities/hashtable.hpp
! src/share/vm/utilities/hashtable.inline.hpp
! src/share/vm/utilities/utf8.cpp
! src/share/vm/utilities/utf8.hpp
! src/share/vm/utilities/xmlstream.cpp
! src/share/vm/utilities/xmlstream.hpp

Changeset: ae4b185f2ed1
Author:    trims
Date:      2011-02-03 23:26 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/ae4b185f2ed1

Merge

! .hgtags
- agent/src/share/classes/sun/jvm/hotspot/oops/SymbolKlass.java
- src/share/vm/ci/ciSymbolKlass.cpp
- src/share/vm/ci/ciSymbolKlass.hpp
- src/share/vm/oops/symbolKlass.cpp
- src/share/vm/oops/symbolKlass.hpp
- src/share/vm/oops/symbolOop.cpp
- src/share/vm/oops/symbolOop.hpp

Changeset: 55b9f498dbce
Author:    cl
Date:      2011-02-10 16:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/55b9f498dbce

Added tag jdk7-b129 for changeset ae4b185f2ed1

! .hgtags

Changeset: 14c2f31280dd
Author:    trims
Date:      2011-02-11 14:30 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/14c2f31280dd

Added tag hs21-b01 for changeset ae4b185f2ed1

! .hgtags

Changeset: b7a938236e43
Author:    tonyp
Date:      2011-01-31 16:28 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/b7a938236e43

7014679: G1: deadlock during concurrent cleanup
Summary: There's a potential deadlock between the concurrent cleanup thread and the GC workers that are trying to allocate and waiting for more free regions to be made available.
Reviewed-by: iveresov, jcoomes

! src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp

Changeset: e49cfa28f585
Author:    ysr
Date:      2011-02-01 10:02 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/e49cfa28f585

6999988: CMS: Increased fragmentation leading to promotion failure after CR#6631166 got implemented
Summary: Fix calculation of _desired, in free list statistics, which was missing an intended set of parentheses.
Reviewed-by: poonam, jmasa

! src/share/vm/gc_implementation/shared/allocationStats.hpp

Changeset: 986b2844f7a2
Author:    brutisso
Date:      2011-02-01 14:05 +0100
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/986b2844f7a2

6789220: CMS: intermittent timeout running nsk/regression/b4796926
Summary: The reference handler java thread and the GC could dead lock
Reviewed-by: never, johnc, jcoomes

! src/share/vm/compiler/compileBroker.cpp

Changeset: c33825b68624
Author:    johnc
Date:      2011-02-02 10:41 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/c33825b68624

6923430: G1: assert(res != 0,"This should have worked.")
7007446: G1: expand the heap with a single step, not one region at a time
Summary: Changed G1CollectedHeap::expand() to expand the committed space by calling VirtualSpace::expand_by() once rather than for every region in the expansion amount. This allows the success or failure of the expansion to be determined before creating any heap regions. Introduced a develop flag G1ExitOnExpansionFailure (false by default) that, when true, will exit the VM if the expansion of the committed space fails. Finally G1CollectedHeap::expand() returns a status back to it's caller so that the caller knows whether to attempt the allocation.
Reviewed-by: brutisso, tonyp

! src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
! src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
! src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
! src/share/vm/gc_implementation/g1/g1RemSet.cpp
! src/share/vm/gc_implementation/g1/g1_globals.hpp

Changeset: 176d0be30214
Author:    phh
Date:      2011-02-03 16:06 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/176d0be30214

7016998: gcutil class LinearLeastSquareFit doesn't initialize some of its fields
Summary: Initialize _sum_x_squared, _intercept and _slope in constructor.
Reviewed-by: bobv, coleenp

! src/share/vm/gc_implementation/shared/gcUtil.cpp

Changeset: c6bf3ca2bb31
Author:    trims
Date:      2011-02-04 16:29 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/c6bf3ca2bb31

Merge


Changeset: d70fe6ab4436
Author:    coleenp
Date:      2011-02-01 11:23 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/d70fe6ab4436

6588413: Use -fvisibility=hidden for gcc compiles
Summary: Add option for gcc 4 and above, define JNIEXPORT and JNIIMPORT to visibility=default, add for jio_snprintf and others since -fvisibility=hidden overrides --version-script definitions.
Reviewed-by: kamg, never

! make/linux/makefiles/gcc.make
! make/linux/makefiles/mapfile-vers-debug
! make/linux/makefiles/mapfile-vers-product
! src/cpu/sparc/vm/jni_sparc.h
! src/cpu/x86/vm/jni_x86.h
! src/cpu/zero/vm/jni_zero.h
! src/os/linux/vm/jvm_linux.cpp
! src/os/linux/vm/os_linux.cpp
! src/os/solaris/vm/os_solaris.cpp
! src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
! src/os_cpu/linux_x86/vm/os_linux_x86.cpp
! src/os_cpu/linux_zero/vm/os_linux_zero.cpp
! src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp
! src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
! src/share/vm/prims/forte.cpp
! src/share/vm/prims/jvm.cpp
! src/share/vm/prims/jvm.h

Changeset: b92c45f2bc75
Author:    bobv
Date:      2011-02-02 11:35 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/b92c45f2bc75

7016023: Enable building ARM and PPC from src/closed repository
Reviewed-by: dholmes, bdelsart

! make/Makefile
+ make/closed.make
! make/jprt.properties
! make/linux/Makefile
! make/linux/makefiles/adlc.make
+ make/linux/makefiles/arm.make
! make/linux/makefiles/buildtree.make
+ make/linux/makefiles/ppc.make
! make/linux/makefiles/rules.make
! make/linux/makefiles/top.make
! make/linux/makefiles/vm.make
+ make/linux/platform_arm
+ make/linux/platform_ppc
! src/os/linux/vm/osThread_linux.cpp
! src/os/linux/vm/os_linux.cpp
! src/os/linux/vm/os_linux.inline.hpp
! src/os/linux/vm/thread_linux.inline.hpp
! src/share/vm/asm/assembler.cpp
! src/share/vm/asm/assembler.hpp
! src/share/vm/asm/codeBuffer.hpp
! src/share/vm/c1/c1_Defs.hpp
! src/share/vm/c1/c1_FpuStackSim.hpp
! src/share/vm/c1/c1_FrameMap.cpp
! src/share/vm/c1/c1_FrameMap.hpp
! src/share/vm/c1/c1_Instruction.hpp
! src/share/vm/c1/c1_LIRAssembler.cpp
! src/share/vm/c1/c1_LIRAssembler.hpp
! src/share/vm/c1/c1_LinearScan.cpp
! src/share/vm/c1/c1_LinearScan.hpp
! src/share/vm/c1/c1_MacroAssembler.hpp
! src/share/vm/c1/c1_globals.hpp
! src/share/vm/classfile/classFileStream.hpp
! src/share/vm/classfile/stackMapTable.hpp
! src/share/vm/classfile/verifier.cpp
! src/share/vm/code/codeBlob.cpp
! src/share/vm/code/compiledIC.hpp
! src/share/vm/code/icBuffer.cpp
! src/share/vm/code/relocInfo.cpp
! src/share/vm/code/relocInfo.hpp
! src/share/vm/code/vmreg.hpp
! src/share/vm/compiler/disassembler.cpp
! src/share/vm/compiler/disassembler.hpp
! src/share/vm/interpreter/abstractInterpreter.hpp
! src/share/vm/interpreter/bytecode.hpp
! src/share/vm/interpreter/bytecodeInterpreter.cpp
! src/share/vm/interpreter/bytecodeInterpreter.hpp
! src/share/vm/interpreter/bytecodeInterpreter.inline.hpp
! src/share/vm/interpreter/bytecodeStream.hpp
! src/share/vm/interpreter/bytecodes.cpp
! src/share/vm/interpreter/bytecodes.hpp
! src/share/vm/interpreter/cppInterpreter.hpp
! src/share/vm/interpreter/cppInterpreterGenerator.hpp
! src/share/vm/interpreter/interpreter.hpp
! src/share/vm/interpreter/interpreterGenerator.hpp
! src/share/vm/interpreter/interpreterRuntime.cpp
! src/share/vm/interpreter/interpreterRuntime.hpp
! src/share/vm/interpreter/templateInterpreter.hpp
! src/share/vm/interpreter/templateInterpreterGenerator.hpp
! src/share/vm/interpreter/templateTable.hpp
! src/share/vm/oops/constantPoolOop.hpp
! src/share/vm/oops/oop.inline.hpp
! src/share/vm/oops/typeArrayOop.hpp
! src/share/vm/opto/buildOopMap.cpp
! src/share/vm/opto/c2_globals.hpp
! src/share/vm/opto/c2compiler.cpp
! src/share/vm/opto/compile.cpp
! src/share/vm/opto/gcm.cpp
! src/share/vm/opto/locknode.hpp
! src/share/vm/opto/output.hpp
! src/share/vm/opto/regmask.cpp
! src/share/vm/opto/regmask.hpp
! src/share/vm/opto/runtime.cpp
! src/share/vm/prims/jniCheck.cpp
! src/share/vm/prims/jni_md.h
! src/share/vm/prims/jvmtiClassFileReconstituter.cpp
! src/share/vm/runtime/deoptimization.cpp
! src/share/vm/runtime/dtraceJSDT.hpp
! src/share/vm/runtime/frame.cpp
! src/share/vm/runtime/frame.hpp
! src/share/vm/runtime/frame.inline.hpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/icache.hpp
! src/share/vm/runtime/java.cpp
! src/share/vm/runtime/javaCalls.hpp
! src/share/vm/runtime/javaFrameAnchor.hpp
! src/share/vm/runtime/os.hpp
! src/share/vm/runtime/registerMap.hpp
! src/share/vm/runtime/relocator.hpp
! src/share/vm/runtime/safepoint.cpp
! src/share/vm/runtime/sharedRuntime.cpp
! src/share/vm/runtime/stackValueCollection.cpp
! src/share/vm/runtime/statSampler.cpp
! src/share/vm/runtime/stubCodeGenerator.cpp
! src/share/vm/runtime/stubRoutines.hpp
! src/share/vm/runtime/thread.hpp
! src/share/vm/runtime/threadLocalStorage.hpp
! src/share/vm/runtime/vmStructs.cpp
! src/share/vm/runtime/vm_version.cpp
! src/share/vm/utilities/copy.hpp
! src/share/vm/utilities/globalDefinitions.hpp
! src/share/vm/utilities/taskqueue.hpp

Changeset: 9cd8a2c2d584
Author:    bobv
Date:      2011-02-02 11:54 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/9cd8a2c2d584

Merge

! src/os/linux/vm/os_linux.cpp

Changeset: face83fc8882
Author:    coleenp
Date:      2011-02-02 18:38 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/face83fc8882

7012088: jump to 0 address because of lack of memory ordering in SignatureHandlerLibrary::add
Summary: Write method signature handler under lock to prevent race with growable array resizing
Reviewed-by: dsamersoff, dholmes

! src/share/vm/interpreter/interpreterRuntime.cpp

Changeset: bf8517f4e4d0
Author:    kamg
Date:      2011-02-02 14:38 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/bf8517f4e4d0

6766644: Redefinition of compiled method fails with assertion "Can not load classes with the Compiler thread"
Summary: Defer posting events from the compiler thread: use service thread
Reviewed-by: coleenp, dholmes, never, dcubed

- agent/src/share/classes/sun/jvm/hotspot/runtime/LowMemoryDetectorThread.java
+ agent/src/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java
! agent/src/share/classes/sun/jvm/hotspot/runtime/Thread.java
! agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java
! src/share/vm/code/nmethod.cpp
! src/share/vm/code/nmethod.hpp
! src/share/vm/prims/jvmtiExport.cpp
! src/share/vm/prims/jvmtiExport.hpp
! src/share/vm/prims/jvmtiImpl.cpp
! src/share/vm/prims/jvmtiImpl.hpp
! src/share/vm/runtime/fprofiler.hpp
! src/share/vm/runtime/mutexLocker.cpp
! src/share/vm/runtime/mutexLocker.hpp
+ src/share/vm/runtime/serviceThread.cpp
+ src/share/vm/runtime/serviceThread.hpp
! src/share/vm/runtime/thread.hpp
! src/share/vm/runtime/vmStructs.cpp
! src/share/vm/services/attachListener.hpp
! src/share/vm/services/lowMemoryDetector.cpp
! src/share/vm/services/lowMemoryDetector.hpp
! src/share/vm/services/management.cpp
! src/share/vm/utilities/macros.hpp

Changeset: d28def44457d
Author:    coleenp
Date:      2011-02-03 21:30 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/d28def44457d

7017009: Secondary out of c-heap memory error reporting out of memory
Summary: Use os::malloc() to allocate buffer to read elf symbols and check for null
Reviewed-by: zgu, phh, dsamersoff, dholmes, dcubed

! src/share/vm/utilities/elfSymbolTable.cpp

Changeset: 5e139f767ddb
Author:    coleenp
Date:      2011-02-03 20:30 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/5e139f767ddb

Merge

- agent/src/share/classes/sun/jvm/hotspot/runtime/LowMemoryDetectorThread.java

Changeset: e9f24eebafd4
Author:    rottenha
Date:      2011-02-07 08:40 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/e9f24eebafd4

Merge

- agent/src/share/classes/sun/jvm/hotspot/runtime/LowMemoryDetectorThread.java

Changeset: d8a72fbc4be7
Author:    kamg
Date:      2011-02-08 17:20 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/d8a72fbc4be7

7003401: Implement VM error-reporting functionality on erroneous termination
Summary: Add support for distribution-specific error reporting
Reviewed-by: coleenp, phh, jcoomes, ohair

! make/Makefile
+ make/altsrc.make
- make/closed.make
! make/linux/makefiles/adlc.make
! make/linux/makefiles/buildtree.make
! make/linux/makefiles/rules.make
! make/linux/makefiles/top.make
! make/linux/makefiles/vm.make
! make/solaris/makefiles/adlc.make
! make/solaris/makefiles/buildtree.make
! make/solaris/makefiles/rules.make
! make/solaris/makefiles/top.make
! make/solaris/makefiles/vm.make
! make/windows/create_obj_files.sh
! make/windows/makefiles/vm.make
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/vm_version.cpp
! src/share/vm/runtime/vm_version.hpp
+ src/share/vm/utilities/errorReporter.cpp
+ src/share/vm/utilities/errorReporter.hpp
! src/share/vm/utilities/ostream.cpp
! src/share/vm/utilities/ostream.hpp
! src/share/vm/utilities/vmError.cpp

Changeset: fb539912d338
Author:    coleenp
Date:      2011-02-07 14:36 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/fb539912d338

6472925: OutOfMemoryError fails to generate stack trace as it now ought
Summary: Print an additional message for OOM during stack trace printing
Reviewed-by: dholmes, phh, acorn, kamg, dcubed

! src/share/vm/runtime/thread.cpp

Changeset: 5fb3ee258e76
Author:    coleenp
Date:      2011-02-08 19:50 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/5fb3ee258e76

Merge

- make/closed.make

Changeset: f36c9fe788b8
Author:    mchung
Date:      2011-02-08 09:11 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/f36c9fe788b8

7017673: Remove setting of the sun.jkernel.DownloadManager as a boot classloader hook
Reviewed-by: alanb, dcubed, coleenp

! src/share/vm/classfile/vmSymbols.hpp
! src/share/vm/runtime/thread.cpp

Changeset: 5197f3d713a1
Author:    mchung
Date:      2011-02-08 22:27 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/5197f3d713a1

Merge

- make/closed.make
! src/share/vm/runtime/thread.cpp

Changeset: 63d374c54045
Author:    ctornqvi
Date:      2011-02-09 11:08 +0100
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/63d374c54045

7014918: Improve core/minidump handling in Hotspot
Summary: Added Minidump support on Windows, enabled large page core dumps when coredump_filter is present and writing out path/rlimit for core dumps.
Reviewed-by: poonam, dsamersoff, sla, coleenp

! src/os/linux/vm/os_linux.cpp
+ src/os/posix/vm/os_posix.cpp
! src/os/windows/vm/os_windows.cpp
! src/os/windows/vm/os_windows.hpp
! src/share/vm/runtime/globals.hpp
! src/share/vm/runtime/os.hpp
! src/share/vm/utilities/vmError.cpp
! src/share/vm/utilities/vmError.hpp

Changeset: b83527d0482d
Author:    ctornqvi
Date:      2011-02-10 12:55 +0100
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/b83527d0482d

7018366: hotspot/runtime_erro Fix for 7014918 does not build using MVC 2003
Summary: Looking at API_VERSION_NUMBER define to see what version of dbghelp.h/imagehlp.h is included to determine what MINIDUMP_TYPEs are defined in the header file
Reviewed-by: acorn, brutisso, sla

! src/os/windows/vm/os_windows.cpp

Changeset: e1523f7fd848
Author:    rottenha
Date:      2011-02-11 05:40 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/e1523f7fd848

Merge

- make/closed.make

Changeset: 2a9f9f2200fa
Author:    trims
Date:      2011-02-11 15:31 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/2a9f9f2200fa

Merge

- agent/src/share/classes/sun/jvm/hotspot/runtime/LowMemoryDetectorThread.java

Changeset: 762bc029de50
Author:    trims
Date:      2011-02-11 15:32 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/762bc029de50

7019104: Bump the HS21 build number to 02
Summary: Update the HS21 build number to 02
Reviewed-by: jcoomes

! make/hotspot_version

Changeset: e9aa2ca89ad6
Author:    kamg
Date:      2011-02-16 16:58 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/e9aa2ca89ad6

7019718: make error reporting flags product instead of diagnostic
Summary: see synopsis
Reviewed-by: acorn, coleenp

! src/share/vm/runtime/globals.hpp

Changeset: 0a2ecf4cc384
Author:    cl
Date:      2011-02-18 14:23 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/hotspot/rev/0a2ecf4cc384

Added tag jdk7-b130 for changeset e9aa2ca89ad6

! .hgtags



From lana.steuck at oracle.com  Mon Feb 21 20:37:55 2011
From: lana.steuck at oracle.com (lana.steuck at oracle.com)
Date: Tue, 22 Feb 2011 04:37:55 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 84 new changesets
Message-ID: <20110222045146.7CAAD4794D@hg.openjdk.java.net>

Changeset: 001dcfd0be4b
Author:    ohair
Date:      2011-02-08 16:30 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/001dcfd0be4b

7016976: Documentation for required ant version  on JDK7 builds on Solaris 10 and Solaris 11
Reviewed-by: rinaldo

! make/common/shared/Defs-versions.gmk
! make/common/shared/Sanity.gmk

Changeset: 1f056ddda771
Author:    ohair
Date:      2011-01-28 14:32 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/1f056ddda771

7014301: Change make 3.81 sanity check to a fatal, 3.81 is needed now
Reviewed-by: alanb

! make/common/shared/Sanity.gmk

Changeset: 3f77dae85c85
Author:    ohair
Date:      2011-02-08 13:06 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/3f77dae85c85

Merge


Changeset: 14cd5d54a8d0
Author:    ohair
Date:      2011-02-08 20:00 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/14cd5d54a8d0

Merge

! make/common/shared/Sanity.gmk

Changeset: 326aac19a89f
Author:    cl
Date:      2011-02-10 16:24 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/326aac19a89f

Added tag jdk7-b129 for changeset 14cd5d54a8d0

! .hgtags

Changeset: 577c5d930e44
Author:    dav
Date:      2011-01-25 15:33 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/577c5d930e44

6693961: cross-window focus transfer ability in the Focus Spec should be revised
Reviewed-by: ant, art

! src/share/classes/java/awt/doc-files/FocusSpec.html

Changeset: 5f3615691623
Author:    dav
Date:      2011-01-25 19:07 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/5f3615691623

6431076: Cursor gets reset to text cursor in xawt TextArea when autoscrolling on append
Reviewed-by: art, anthony

! src/solaris/classes/sun/awt/X11/XComponentPeer.java
! src/solaris/classes/sun/awt/X11/XGlobalCursorManager.java
! src/solaris/classes/sun/awt/X11/XTextAreaPeer.java
+ test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test.java
+ test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test1.java

Changeset: 6fd2d28e66cd
Author:    denis
Date:      2011-01-28 16:52 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/6fd2d28e66cd

6340263: Regression testcase java/awt/dnd/DnDClipboardDeadlockTest throughs IOException: Owner timed out
Reviewed-by: anthony, art

! src/solaris/classes/sun/awt/X11/XSelection.java

Changeset: 9da15efec22b
Author:    andrew
Date:      2011-02-01 17:44 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/9da15efec22b

7015232: missing copyright header in CheckZOrderChange.java
Summary: Add standard GPL header as on other tests
Reviewed-by: anthony

! test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java

Changeset: 3244848a4a2b
Author:    dav
Date:      2011-02-04 17:32 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/3244848a4a2b

6741526: KeyboardFocusManager.setDefaultFocusTraversalPolicy(FocusTraversalPolicy) affects created components
Reviewed-by: ant, dcherepanov

! src/share/classes/java/awt/Window.java
+ test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_AWT.java
+ test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java

Changeset: b5fc02e1a944
Author:    lana
Date:      2011-02-08 14:19 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/b5fc02e1a944

Merge


Changeset: 69fac04eda38
Author:    rupashka
Date:      2011-01-27 14:23 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/69fac04eda38

6902615: Method JTextComponent.getKeyStrokesForAction() throws StackOverflowError
Reviewed-by: peterz

! src/share/classes/javax/swing/text/Keymap.java

Changeset: ec066e903b84
Author:    rupashka
Date:      2011-01-27 14:33 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/ec066e903b84

6935155: @since tag is missing in JTextComponent.save/restoreComposedText
Reviewed-by: alexp

! src/share/classes/javax/swing/text/JTextComponent.java

Changeset: 457f6b2cc155
Author:    malenkov
Date:      2011-01-31 21:22 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/457f6b2cc155

7001484: DOC: Method javax.swing.border.StrokeBorder.getBorderInsets() should specify how it converts float
Reviewed-by: alexp

! src/share/classes/javax/swing/border/StrokeBorder.java

Changeset: 020b4695370c
Author:    malenkov
Date:      2011-01-31 21:31 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/020b4695370c

7001118: DOC: javax.swing.border.StrokeBorder.paintBorder() doesn't throw NPE in all specified cases
Reviewed-by: alexp

! src/share/classes/javax/swing/border/StrokeBorder.java

Changeset: 07bea0d4e454
Author:    malenkov
Date:      2011-01-31 21:49 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/07bea0d4e454

6999045: DOC: Unclear spec for BevelBorder constructor and BorderFactory factory method (colors switching)
Reviewed-by: alexp

! src/share/classes/javax/swing/BorderFactory.java
! src/share/classes/javax/swing/border/BevelBorder.java

Changeset: cbcd461067c5
Author:    rupashka
Date:      2011-02-02 18:37 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/cbcd461067c5

6988168: Press the "Toggle Font" button.The size of the combo box didn't change.
Reviewed-by: alexp

! src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java

Changeset: 6c4b6780ab20
Author:    rupashka
Date:      2011-02-02 18:41 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/6c4b6780ab20

6988176: There is focus painted inside the button.
Reviewed-by: alexp

! src/share/classes/sun/swing/WindowsPlacesBar.java

Changeset: 057e9b837105
Author:    rupashka
Date:      2011-02-03 16:30 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/057e9b837105

7013453: BufferStrategyPaintManager.dispose will cause IllegalMonitorStateException in event thread
Reviewed-by: alexp

! src/share/classes/javax/swing/BufferStrategyPaintManager.java
+ test/javax/swing/RepaintManager/7013453/bug7013453.java

Changeset: 0fae79ec7248
Author:    naoto
Date:      2011-02-03 09:59 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/0fae79ec7248

7013282: No appropriate CCC request for listed JDK 7 changes in java.util.spi package (b121)
Reviewed-by: peytoia

! src/share/classes/java/util/spi/LocaleNameProvider.java

Changeset: c7e368a95c75
Author:    alexp
Date:      2011-02-07 21:15 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/c7e368a95c75

7016942: Revert a refactoring in TooltipManager to allow reflection hack
Reviewed-by: rupashka

! src/share/classes/javax/swing/ToolTipManager.java

Changeset: 989f6d3eee0d
Author:    alexp
Date:      2011-02-07 21:34 +0300
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/989f6d3eee0d

6979537: closed/javax/swing/JSplitPane/UnitTest/UnitTest.java fails
Reviewed-by: rupashka

! src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java

Changeset: 842a0f8c89ea
Author:    naoto
Date:      2011-02-08 09:04 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/842a0f8c89ea

7015500: Locale.toLanguageTag() uses "und" as lang subtag for private use only Locale
Reviewed-by: srl

! src/share/classes/java/util/Locale.java
! src/share/classes/sun/util/locale/LanguageTag.java
! test/java/util/Locale/LocaleEnhanceTest.java

Changeset: d002fe0c57c5
Author:    lana
Date:      2011-02-08 14:19 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/d002fe0c57c5

Merge


Changeset: dbfc1e419cb2
Author:    darcy
Date:      2011-01-24 20:04 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/dbfc1e419cb2

7006578: Project Coin: Retrofit JDK libraries with @SafeVarargs
Reviewed-by: mduigou, alexp

! src/share/classes/java/util/Arrays.java
! src/share/classes/java/util/Collections.java
! src/share/classes/java/util/EnumSet.java
! src/share/classes/javax/swing/SwingWorker.java
! src/share/classes/sun/swing/AccumulativeRunnable.java

Changeset: ae38d1374e31
Author:    mullan
Date:      2011-01-24 14:56 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/ae38d1374e31

5001004: Required Security Algorithms need to be defined
Reviewed-by: wetmore

! src/share/classes/java/security/AlgorithmParameterGenerator.java
! src/share/classes/java/security/AlgorithmParameters.java
! src/share/classes/java/security/KeyFactory.java
! src/share/classes/java/security/KeyPairGenerator.java
! src/share/classes/java/security/KeyStore.java
! src/share/classes/java/security/MessageDigest.java
! src/share/classes/java/security/Policy.java
! src/share/classes/java/security/SecureRandom.java
! src/share/classes/java/security/Security.java
! src/share/classes/java/security/Signature.java
! src/share/classes/java/security/cert/CertPath.java
! src/share/classes/java/security/cert/CertPathBuilder.java
! src/share/classes/java/security/cert/CertPathValidator.java
! src/share/classes/java/security/cert/CertStore.java
! src/share/classes/java/security/cert/Certificate.java
! src/share/classes/java/security/cert/CertificateFactory.java
! src/share/classes/java/security/cert/CertificateFactorySpi.java
! src/share/classes/java/security/cert/package.html
! src/share/classes/java/security/package.html
! src/share/classes/javax/crypto/Cipher.java
! src/share/classes/javax/crypto/ExemptionMechanism.java
! src/share/classes/javax/crypto/KeyAgreement.java
! src/share/classes/javax/crypto/KeyGenerator.java
! src/share/classes/javax/crypto/Mac.java
! src/share/classes/javax/crypto/SecretKeyFactory.java
! src/share/classes/javax/crypto/package.html
! src/share/classes/javax/net/ssl/SSLContext.java
! src/share/classes/javax/net/ssl/package.html
! src/share/classes/javax/security/auth/login/Configuration.java
! src/share/classes/javax/security/auth/login/package.html

Changeset: b33e9b15835e
Author:    mullan
Date:      2011-01-24 15:08 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/b33e9b15835e

Merge

- make/common/internal/BinaryPlugs.gmk
- make/java/hpi/Makefile
- make/java/hpi/hpi_common.gmk
- make/java/hpi/native/Makefile
- make/java/hpi/native/mapfile-vers
- make/java/hpi/native/reorder-i586
- make/java/hpi/native/reorder-sparc
- make/java/hpi/native/reorder-sparcv9
- make/java/hpi/windows/Makefile
- src/share/classes/java/dyn/JavaMethodHandle.java
- src/share/classes/java/dyn/LinkagePermission.java
- src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java
! src/share/classes/java/security/Security.java
! src/share/classes/javax/net/ssl/SSLContext.java
- src/share/classes/sun/java2d/pisces/LineSink.java
- src/share/classes/sun/net/httpserver/SelectorCache.java
- src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java
- src/share/classes/sun/security/krb5/KrbKdcReq.java
- src/share/classes/sun/security/krb5/internal/TCPClient.java
- src/share/classes/sun/security/krb5/internal/UDPClient.java
- src/share/demo/nio/zipfs/META-INF/services/java.nio.file.spi.FileSystemProvider
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/JarFileSystemProvider.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipCoder.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipConstants.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipDirectoryStream.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileAttributeView.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileAttributes.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileStore.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileSystem.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileSystemProvider.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipInfo.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipPath.java
- src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipUtils.java
- src/share/hpi/export/bool.h
- src/share/hpi/export/dll.h
- src/share/hpi/export/hpi.h
- src/share/hpi/include/hpi_impl.h
- src/share/hpi/include/vm_calls.h
- src/share/hpi/src/hpi.c
- src/share/native/sun/font/layout/HebrewLigatureData.cpp
- src/share/native/sun/font/layout/HebrewShaping.cpp
- src/share/native/sun/font/layout/HebrewShaping.h
- src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java
- src/solaris/hpi/export/byteorder_md.h
- src/solaris/hpi/export/hpi_md.h
- src/solaris/hpi/export/io_md.h
- src/solaris/hpi/export/path_md.h
- src/solaris/hpi/export/timeval_md.h
- src/solaris/hpi/include/hpi_init.h
- src/solaris/hpi/include/interrupt.h
- src/solaris/hpi/include/largefile.h
- src/solaris/hpi/include/largefile_linux.h
- src/solaris/hpi/include/largefile_solaris.h
- src/solaris/hpi/native_threads/include/condvar_md.h
- src/solaris/hpi/native_threads/include/monitor_md.h
- src/solaris/hpi/native_threads/include/mutex_md.h
- src/solaris/hpi/native_threads/include/np.h
- src/solaris/hpi/native_threads/include/porting.h
- src/solaris/hpi/native_threads/include/threads_md.h
- src/solaris/hpi/native_threads/src/condvar_md.c
- src/solaris/hpi/native_threads/src/interrupt_md.c
- src/solaris/hpi/native_threads/src/monitor_md.c
- src/solaris/hpi/native_threads/src/mutex_md.c
- src/solaris/hpi/native_threads/src/sys_api_td.c
- src/solaris/hpi/native_threads/src/threads_linux.c
- src/solaris/hpi/native_threads/src/threads_md.c
- src/solaris/hpi/native_threads/src/threads_solaris.c
- src/solaris/hpi/src/interrupt.c
- src/solaris/hpi/src/linker_md.c
- src/solaris/hpi/src/memory_md.c
- src/solaris/hpi/src/system_md.c
- src/windows/hpi/export/byteorder_md.h
- src/windows/hpi/export/hpi_md.h
- src/windows/hpi/export/io_md.h
- src/windows/hpi/export/path_md.h
- src/windows/hpi/export/timeval_md.h
- src/windows/hpi/include/monitor_md.h
- src/windows/hpi/include/mutex_md.h
- src/windows/hpi/include/threads_md.h
- src/windows/hpi/src/linker_md.c
- src/windows/hpi/src/memory_md.c
- src/windows/hpi/src/monitor_md.c
- src/windows/hpi/src/path_md.c
- src/windows/hpi/src/socket_md.c
- src/windows/hpi/src/sys_api_md.c
- src/windows/hpi/src/system_md.c
- src/windows/hpi/src/threads_md.c
- test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html
- test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java
- test/java/net/InetAddress/B4762344.java
- test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/InetAddress/Simple1NameServiceDescriptor.java
- test/java/net/InetAddress/Simple2NameServiceDescriptor.java
- test/java/net/InetAddress/SimpleNameService.java
- test/java/nio/channels/AsynchronousDatagramChannel/Basic.java
- test/javax/script/E4XErrorTest.java
- test/javax/swing/SwingWorker/6480289/bug6480289.java
- test/sun/net/InetAddress/nameservice/B6442088.java
- test/sun/net/InetAddress/nameservice/CacheTest.java
- test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java
- test/sun/security/krb5/auto/basic.sh

Changeset: 6ac9383640c6
Author:    mullan
Date:      2011-01-24 15:46 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/6ac9383640c6

Merge


Changeset: 6e7bed89ce84
Author:    mullan
Date:      2011-01-25 08:41 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/6e7bed89ce84

Merge


Changeset: bf1b937076db
Author:    alanb
Date:      2011-01-26 18:01 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/bf1b937076db

7012663: javadoc warning in javax.swing.JComponent and javax.swing.plaf.synth.SynthTextPaneUI
Reviewed-by: alexp

! src/share/classes/javax/swing/JComponent.java
! src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java

Changeset: abab55565eda
Author:    darcy
Date:      2011-01-26 12:32 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/abab55565eda

7013420: Project Coin: remove general expression support from try-with-resources statement
Reviewed-by: alanb

! test/java/nio/channels/FileChannel/Truncate.java

Changeset: 236e3f2d0a6b
Author:    alanb
Date:      2011-01-28 09:28 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/236e3f2d0a6b

7006126: (fs) Updates to file system API (1/2011)
Reviewed-by: chegar, sherman

! make/java/java/FILES_java.gmk
! make/java/nio/FILES_java.gmk
! make/mkdemo/Makefile
! src/share/classes/java/io/BufferedReader.java
! src/share/classes/java/io/BufferedWriter.java
! src/share/classes/java/io/File.java
! src/share/classes/java/io/FileInputStream.java
! src/share/classes/java/io/FileOutputStream.java
! src/share/classes/java/io/FilePermission.java
! src/share/classes/java/io/SerialCallbackContext.java
- src/share/classes/java/io/TempFileHelper.java
! src/share/classes/java/nio/channels/FileChannel.java
! src/share/classes/java/nio/channels/SeekableByteChannel.java
! src/share/classes/java/nio/file/AccessMode.java
+ src/share/classes/java/nio/file/CopyMoveHelper.java
! src/share/classes/java/nio/file/CopyOption.java
! src/share/classes/java/nio/file/DirectoryStream.java
- src/share/classes/java/nio/file/FileRef.java
! src/share/classes/java/nio/file/FileStore.java
! src/share/classes/java/nio/file/FileSystem.java
! src/share/classes/java/nio/file/FileSystems.java
! src/share/classes/java/nio/file/FileTreeWalker.java
! src/share/classes/java/nio/file/FileVisitor.java
! src/share/classes/java/nio/file/Files.java
! src/share/classes/java/nio/file/LinkOption.java
! src/share/classes/java/nio/file/LinkPermission.java
! src/share/classes/java/nio/file/OpenOption.java
! src/share/classes/java/nio/file/Path.java
! src/share/classes/java/nio/file/PathMatcher.java
! src/share/classes/java/nio/file/Paths.java
! src/share/classes/java/nio/file/SecureDirectoryStream.java
+ src/share/classes/java/nio/file/TempFileHelper.java
! src/share/classes/java/nio/file/WatchEvent.java
! src/share/classes/java/nio/file/WatchKey.java
! src/share/classes/java/nio/file/WatchService.java
! src/share/classes/java/nio/file/attribute/AclEntry.java
! src/share/classes/java/nio/file/attribute/AclFileAttributeView.java
- src/share/classes/java/nio/file/attribute/Attributes.java
! src/share/classes/java/nio/file/attribute/BasicFileAttributeView.java
! src/share/classes/java/nio/file/attribute/BasicFileAttributes.java
! src/share/classes/java/nio/file/attribute/DosFileAttributeView.java
! src/share/classes/java/nio/file/attribute/DosFileAttributes.java
! src/share/classes/java/nio/file/attribute/FileAttribute.java
! src/share/classes/java/nio/file/attribute/FileAttributeView.java
! src/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java
! src/share/classes/java/nio/file/attribute/FileTime.java
! src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
! src/share/classes/java/nio/file/attribute/PosixFileAttributes.java
! src/share/classes/java/nio/file/attribute/PosixFilePermission.java
! src/share/classes/java/nio/file/attribute/PosixFilePermissions.java
! src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
! src/share/classes/java/nio/file/attribute/package-info.java
! src/share/classes/java/nio/file/package-info.java
! src/share/classes/java/nio/file/spi/FileSystemProvider.java
! src/share/classes/java/nio/file/spi/FileTypeDetector.java
! src/share/classes/java/util/Scanner.java
! src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java
! src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java
+ src/share/classes/sun/nio/fs/AbstractFileSystemProvider.java
! src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java
! src/share/classes/sun/nio/fs/AbstractPath.java
! src/share/classes/sun/nio/fs/AbstractPoller.java
! src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java
! src/share/classes/sun/nio/fs/AbstractWatchKey.java
! src/share/classes/sun/nio/fs/AbstractWatchService.java
! src/share/classes/sun/nio/fs/DynamicFileAttributeView.java
! src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java
! src/share/classes/sun/nio/fs/PollingWatchService.java
! src/share/classes/sun/security/provider/SeedGenerator.java
! src/share/classes/sun/tools/jar/Main.java
! src/share/sample/nio/file/AclEdit.java
! src/share/sample/nio/file/Chmod.java
! src/share/sample/nio/file/Copy.java
! src/share/sample/nio/file/DiskUsage.java
! src/share/sample/nio/file/FileType.java
! src/share/sample/nio/file/WatchDir.java
! src/share/sample/nio/file/Xdd.java
! src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java
! src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java
! src/solaris/classes/sun/nio/fs/LinuxFileSystem.java
! src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java
! src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java
! src/solaris/classes/sun/nio/fs/LinuxWatchService.java
! src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
! src/solaris/classes/sun/nio/fs/SolarisFileSystem.java
! src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java
! src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java
! src/solaris/classes/sun/nio/fs/SolarisWatchService.java
! src/solaris/classes/sun/nio/fs/UnixCopyFile.java
! src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java
! src/solaris/classes/sun/nio/fs/UnixFileAttributes.java
! src/solaris/classes/sun/nio/fs/UnixFileStore.java
! src/solaris/classes/sun/nio/fs/UnixFileSystem.java
! src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java
! src/solaris/classes/sun/nio/fs/UnixPath.java
! src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java
! src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java
! src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java
! src/windows/classes/sun/nio/fs/WindowsFileCopy.java
! src/windows/classes/sun/nio/fs/WindowsFileStore.java
! src/windows/classes/sun/nio/fs/WindowsFileSystem.java
! src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java
! src/windows/classes/sun/nio/fs/WindowsPath.java
! src/windows/classes/sun/nio/fs/WindowsPathParser.java
! src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java
! src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java
! src/windows/classes/sun/nio/fs/WindowsWatchService.java
! test/demo/zipfs/basic.sh
! test/java/io/File/IsHidden.java
! test/java/io/File/SetAccess.java
! test/java/io/File/SymLinks.java
! test/java/io/FileInputStream/LargeFileAvailable.java
! test/java/nio/channels/FileChannel/AtomicAppend.java
! test/java/nio/channels/FileChannel/Transfer.java
! test/java/nio/file/DirectoryStream/Basic.java
! test/java/nio/file/DirectoryStream/DriveLetter.java
! test/java/nio/file/DirectoryStream/SecureDS.java
! test/java/nio/file/FileStore/Basic.java
+ test/java/nio/file/Files/BytesAndLines.java
+ test/java/nio/file/Files/CheckPermissions.java
- test/java/nio/file/Files/ContentType.java
+ test/java/nio/file/Files/CopyAndMove.java
- test/java/nio/file/Files/CreateFileTree.java
+ test/java/nio/file/Files/DeleteOnClose.java
+ test/java/nio/file/Files/FileAttributes.java
- test/java/nio/file/Files/ForceLoad.java
+ test/java/nio/file/Files/InterruptCopy.java
+ test/java/nio/file/Files/Links.java
- test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector
- test/java/nio/file/Files/MaxDepth.java
! test/java/nio/file/Files/Misc.java
+ test/java/nio/file/Files/PassThroughFileSystem.java
- test/java/nio/file/Files/PrintFileTree.java
+ test/java/nio/file/Files/SBC.java
- test/java/nio/file/Files/SimpleFileTypeDetector.java
- test/java/nio/file/Files/SkipSiblings.java
+ test/java/nio/file/Files/TemporaryFiles.java
- test/java/nio/file/Files/TerminateWalk.java
- test/java/nio/file/Files/WalkWithSecurity.java
+ test/java/nio/file/Files/delete_on_close.sh
- test/java/nio/file/Files/denyAll.policy
- test/java/nio/file/Files/grantAll.policy
- test/java/nio/file/Files/grantTopOnly.policy
+ test/java/nio/file/Files/probeContentType/Basic.java
+ test/java/nio/file/Files/probeContentType/ForceLoad.java
+ test/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector
+ test/java/nio/file/Files/probeContentType/SimpleFileTypeDetector.java
+ test/java/nio/file/Files/walkFileTree/CreateFileTree.java
+ test/java/nio/file/Files/walkFileTree/MaxDepth.java
+ test/java/nio/file/Files/walkFileTree/Nulls.java
+ test/java/nio/file/Files/walkFileTree/PrintFileTree.java
+ test/java/nio/file/Files/walkFileTree/SkipSiblings.java
+ test/java/nio/file/Files/walkFileTree/TerminateWalk.java
+ test/java/nio/file/Files/walkFileTree/WalkWithSecurity.java
+ test/java/nio/file/Files/walkFileTree/denyAll.policy
+ test/java/nio/file/Files/walkFileTree/grantAll.policy
+ test/java/nio/file/Files/walkFileTree/grantTopOnly.policy
+ test/java/nio/file/Files/walkFileTree/walk_file_tree.sh
- test/java/nio/file/Files/walk_file_tree.sh
- test/java/nio/file/Path/CheckPermissions.java
- test/java/nio/file/Path/CopyAndMove.java
- test/java/nio/file/Path/DeleteOnClose.java
- test/java/nio/file/Path/FileAttributes.java
- test/java/nio/file/Path/InterruptCopy.java
- test/java/nio/file/Path/Links.java
! test/java/nio/file/Path/Misc.java
- test/java/nio/file/Path/PassThroughFileSystem.java
! test/java/nio/file/Path/PathOps.java
- test/java/nio/file/Path/SBC.java
- test/java/nio/file/Path/TemporaryFiles.java
- test/java/nio/file/Path/delete_on_close.sh
! test/java/nio/file/TestUtil.java
! test/java/nio/file/WatchService/Basic.java
! test/java/nio/file/WatchService/FileTreeModifier.java
! test/java/nio/file/WatchService/LotsOfEvents.java
! test/java/nio/file/WatchService/SensitivityModifier.java
! test/java/nio/file/attribute/AclFileAttributeView/Basic.java
! test/java/nio/file/attribute/BasicFileAttributeView/Basic.java
! test/java/nio/file/attribute/DosFileAttributeView/Basic.java
- test/java/nio/file/attribute/FileStoreAttributeView/Basic.java
! test/java/nio/file/attribute/FileTime/Basic.java
! test/java/nio/file/attribute/PosixFileAttributeView/Basic.java
! test/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java
! test/java/nio/file/spi/SetDefaultProvider.java
! test/java/nio/file/spi/TestProvider.java

Changeset: 60d347deb54d
Author:    alanb
Date:      2011-01-28 09:31 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/60d347deb54d

Merge

- src/share/classes/java/io/TempFileHelper.java
- src/share/classes/java/nio/file/FileRef.java
- src/share/classes/java/nio/file/attribute/Attributes.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java
! test/demo/zipfs/basic.sh
- test/java/nio/file/Files/ContentType.java
- test/java/nio/file/Files/CreateFileTree.java
- test/java/nio/file/Files/ForceLoad.java
- test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector
- test/java/nio/file/Files/MaxDepth.java
- test/java/nio/file/Files/PrintFileTree.java
- test/java/nio/file/Files/SimpleFileTypeDetector.java
- test/java/nio/file/Files/SkipSiblings.java
- test/java/nio/file/Files/TerminateWalk.java
- test/java/nio/file/Files/WalkWithSecurity.java
- test/java/nio/file/Files/denyAll.policy
- test/java/nio/file/Files/grantAll.policy
- test/java/nio/file/Files/grantTopOnly.policy
- test/java/nio/file/Files/walk_file_tree.sh
- test/java/nio/file/Path/CheckPermissions.java
- test/java/nio/file/Path/CopyAndMove.java
- test/java/nio/file/Path/DeleteOnClose.java
- test/java/nio/file/Path/FileAttributes.java
- test/java/nio/file/Path/InterruptCopy.java
- test/java/nio/file/Path/Links.java
- test/java/nio/file/Path/PassThroughFileSystem.java
- test/java/nio/file/Path/SBC.java
- test/java/nio/file/Path/TemporaryFiles.java
- test/java/nio/file/Path/delete_on_close.sh
- test/java/nio/file/attribute/FileStoreAttributeView/Basic.java

Changeset: dea360853f8b
Author:    alanb
Date:      2011-01-28 13:26 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/dea360853f8b

7015410: test/java/net/Socks/SocksProxyVersion.java needs to be updated due to 7013420
Reviewed-by: chegar

! test/java/net/Socks/SocksProxyVersion.java

Changeset: d21a1ce074a7
Author:    darcy
Date:      2011-01-28 17:09 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/d21a1ce074a7

7015156: Remove JSR 308 changes from core libraries
Reviewed-by: mduigou

! src/share/classes/java/lang/SuppressWarnings.java
! src/share/classes/java/lang/annotation/ElementType.java

Changeset: f110edeb4428
Author:    darcy
Date:      2011-02-01 00:29 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/f110edeb4428

7015827: Fix HTML validation issues in java.math package
Reviewed-by: mduigou

! src/share/classes/java/math/BigDecimal.java
! src/share/classes/java/math/RoundingMode.java

Changeset: d4bc38aa7594
Author:    xuelei
Date:      2011-02-01 04:45 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/d4bc38aa7594

7011497: new CertPathValidatorException.BasicReason enum constant for constrained algorithm
Summary: add new BasicReason and improve trust anchor searching method during cert path validation
Reviewed-by: mullan

! src/share/classes/java/security/cert/CertPathValidatorException.java
+ src/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java
! src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java
! src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
! src/share/classes/sun/security/provider/certpath/ForwardBuilder.java
! src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
! src/share/classes/sun/security/validator/SimpleValidator.java
! test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java
! test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java
! test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java

Changeset: 21d7cd823247
Author:    sundar
Date:      2011-02-01 21:00 +0530
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/21d7cd823247

7015908: 3 javax.script tests fail with openjdk build
Reviewed-by: alanb

! test/javax/script/CauseExceptionTest.java
! test/javax/script/StringWriterPrintTest.java
! test/javax/script/UnescapedBracketRegExTest.java

Changeset: 312dc0abb960
Author:    sherman
Date:      2011-02-01 14:20 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/312dc0abb960

7015391: (zipfs) Update zip provider for 1/2011 changes
7014948: (zipfs) ZipFileSystem.newFileSystem(Path...) should not throw FileSystemAlreadyExistsException
7015139: (zipfs) ZipPath.delete() should throw DirectoryNotEmptyException when handling "real, non-empty" dir
Summary: zip filesystem provider update
Reviewed-by: alanb

! make/mkdemo/Makefile
! src/share/demo/nio/zipfs/Demo.java
! src/share/demo/nio/zipfs/README.txt
! src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java
! src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java
! src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
! src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java
! src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipPath.java
- src/share/demo/zipfs
! test/demo/zipfs/Basic.java
! test/demo/zipfs/PathOps.java
! test/demo/zipfs/ZipFSTester.java
! test/demo/zipfs/basic.sh

Changeset: 25462d7eee24
Author:    briangoetz
Date:      2011-02-02 13:13 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/25462d7eee24

7012540: java.util.Objects.nonNull() incorrectly named
Reviewed-by: darcy, weijun

! src/share/classes/java/io/PrintStream.java
! src/share/classes/java/io/PrintWriter.java
! src/share/classes/java/lang/StackTraceElement.java
! src/share/classes/java/nio/file/DirectoryIteratorException.java
! src/share/classes/java/nio/file/FileTreeWalker.java
! src/share/classes/java/nio/file/Files.java
! src/share/classes/java/nio/file/SimpleFileVisitor.java
! src/share/classes/java/util/Formatter.java
! src/share/classes/java/util/Objects.java
! src/share/classes/java/util/Scanner.java
! src/share/classes/sun/security/krb5/KrbAsRep.java
! test/java/util/Objects/BasicObjectsTest.java

Changeset: 3c86f24f7500
Author:    chegar
Date:      2011-02-03 10:10 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/3c86f24f7500

7008595: Class loader leak caused by keepAliveTimer thread in KeepAliveCache
Reviewed-by: michaelm

! src/share/classes/sun/net/www/http/KeepAliveCache.java
! src/share/classes/sun/net/www/http/KeepAliveStream.java

Changeset: dff9b6d18628
Author:    coffeys
Date:      2011-02-03 11:28 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/dff9b6d18628

7016897: Copyright header correction : test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java
Reviewed-by: vinnie

! test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java

Changeset: 0f5dc2fc81b1
Author:    chegar
Date:      2011-02-03 11:56 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/0f5dc2fc81b1

6887710: Jar index should avoid putting META-INF in the INDEX.LIST
Reviewed-by: michaelm

! src/share/classes/sun/misc/JarIndex.java
+ test/sun/misc/JarIndex/metaInfFilenames/Basic.java
+ test/sun/misc/JarIndex/metaInfFilenames/jarA/META-INF/services/my.happy.land
+ test/sun/misc/JarIndex/metaInfFilenames/jarA/a/A.java
+ test/sun/misc/JarIndex/metaInfFilenames/jarA/com/message/spi/MessageService.java
+ test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/JAVA2.DS
+ test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/services/no.name.service
+ test/sun/misc/JarIndex/metaInfFilenames/jarB/b/B.java
+ test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts.mf
+ test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/Company-corporate.ttf
+ test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/kidpr.ttf
+ test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/services/com.message.spi.MessageService
+ test/sun/misc/JarIndex/metaInfFilenames/jarC/my/impl/StandardMessageService.java

Changeset: 68e3eba12afe
Author:    michaelm
Date:      2011-02-03 12:57 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/68e3eba12afe

6751021: TEST_BUG: race condition in the test java/lang/Runtime/exec/Duped.java
Reviewed-by: alanb

! test/java/lang/Runtime/exec/Duped.java

Changeset: e2a182adb30f
Author:    alanb
Date:      2011-02-03 13:37 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/e2a182adb30f

7014794: (file) lookupPrincipalByGroupName fails to find large NIS groups
Reviewed-by: chegar

! src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c

Changeset: 515512634eb4
Author:    vinnie
Date:      2011-02-03 19:09 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/515512634eb4

6997561: A request for better error handling in JNDI
Reviewed-by: robm

! src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java
+ test/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java

Changeset: 035ecca4379c
Author:    sherman
Date:      2011-02-03 13:49 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/035ecca4379c

7014645: Support perl style Unicode hex notation \x{...}
Summary: Added the construct \x{...} for Unicode hex notation support
Reviewed-by: alanb, okutsu

! src/share/classes/java/util/regex/Pattern.java
! test/java/util/regex/RegExTest.java

Changeset: 3c1eca364cc7
Author:    ksrini
Date:      2011-02-03 15:41 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/3c1eca364cc7

6968053: (launcher) hide exceptions under certain launcher failures
Reviewed-by: mchung

! src/share/bin/java.c
! src/share/classes/sun/launcher/LauncherHelper.java
! src/share/classes/sun/launcher/resources/launcher.properties
! src/share/classes/sun/misc/VM.java
! test/tools/launcher/Arrrghs.java

Changeset: 1b5c838b8db8
Author:    vinnie
Date:      2011-02-04 00:33 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/1b5c838b8db8

6989705: ECC security code native code compiler warnings
Reviewed-by: alanb, ohair

! src/share/native/sun/security/ec/ECC_JNI.cpp
! src/share/native/sun/security/ec/impl/ec.c
! src/share/native/sun/security/ec/impl/ec.h
! src/share/native/sun/security/ec/impl/ec2.h
! src/share/native/sun/security/ec/impl/ec2_163.c
! src/share/native/sun/security/ec/impl/ec2_193.c
! src/share/native/sun/security/ec/impl/ec2_233.c
! src/share/native/sun/security/ec/impl/ec2_aff.c
! src/share/native/sun/security/ec/impl/ec2_mont.c
! src/share/native/sun/security/ec/impl/ec_naf.c
! src/share/native/sun/security/ec/impl/ecc_impl.h
! src/share/native/sun/security/ec/impl/ecdecode.c
! src/share/native/sun/security/ec/impl/ecl-curve.h
! src/share/native/sun/security/ec/impl/ecl-exp.h
! src/share/native/sun/security/ec/impl/ecl-priv.h
! src/share/native/sun/security/ec/impl/ecl.c
! src/share/native/sun/security/ec/impl/ecl.h
! src/share/native/sun/security/ec/impl/ecl_curve.c
! src/share/native/sun/security/ec/impl/ecl_gf.c
! src/share/native/sun/security/ec/impl/ecl_mult.c
! src/share/native/sun/security/ec/impl/ecp.h
! src/share/native/sun/security/ec/impl/ecp_192.c
! src/share/native/sun/security/ec/impl/ecp_224.c
! src/share/native/sun/security/ec/impl/ecp_256.c
! src/share/native/sun/security/ec/impl/ecp_384.c
! src/share/native/sun/security/ec/impl/ecp_521.c
! src/share/native/sun/security/ec/impl/ecp_aff.c
! src/share/native/sun/security/ec/impl/ecp_jac.c
! src/share/native/sun/security/ec/impl/ecp_jm.c
! src/share/native/sun/security/ec/impl/ecp_mont.c
! src/share/native/sun/security/ec/impl/logtab.h
! src/share/native/sun/security/ec/impl/mp_gf2m-priv.h
! src/share/native/sun/security/ec/impl/mp_gf2m.c
! src/share/native/sun/security/ec/impl/mp_gf2m.h
! src/share/native/sun/security/ec/impl/mpi-config.h
! src/share/native/sun/security/ec/impl/mpi-priv.h
! src/share/native/sun/security/ec/impl/mpi.c
! src/share/native/sun/security/ec/impl/mpi.h
! src/share/native/sun/security/ec/impl/mplogic.c
! src/share/native/sun/security/ec/impl/mplogic.h
! src/share/native/sun/security/ec/impl/mpmontg.c
! src/share/native/sun/security/ec/impl/mpprime.h
! src/share/native/sun/security/ec/impl/oid.c
! src/share/native/sun/security/ec/impl/secitem.c
! src/share/native/sun/security/ec/impl/secoidt.h

Changeset: fed61c2f4d14
Author:    vinnie
Date:      2011-02-04 00:33 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/fed61c2f4d14

Merge


Changeset: 78fe1b7a9a1a
Author:    vinnie
Date:      2011-02-04 09:52 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/78fe1b7a9a1a

7017176: Several JNDI tests are mssing GPL header
Reviewed-by: alanb

! test/com/sun/jndi/ldap/LdapName/Case.java
! test/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java
! test/com/sun/jndi/ldap/LdapName/UnescapeTest.java
! test/com/sun/jndi/ldap/ReadTimeoutTest.java

Changeset: 9599534b1727
Author:    lancea
Date:      2011-02-04 09:07 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/9599534b1727

7014095: Broken link in java.sql package specification
Reviewed-by: alanb

! src/share/classes/java/sql/package.html

Changeset: c5f953e920c6
Author:    mduigou
Date:      2011-02-04 12:54 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/c5f953e920c6

7015783: Update JDK Netbeans projects to -source 1.7
Reviewed-by: darcy

! make/netbeans/common/java-data-native.ent
! make/netbeans/common/java-data-no-native.ent

Changeset: b8662dac7c91
Author:    sherman
Date:      2011-02-04 13:17 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/b8662dac7c91

7005986: (zipfs) ZipPath.startsWith() fails because of the implementation of getName(index)
Summary: Updated starsWith/endsWith to be consistent with default file system
Reviewed-by: alanb

! src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipPath.java
! test/demo/zipfs/PathOps.java
! test/demo/zipfs/basic.sh

Changeset: a775b8d3fed0
Author:    lana
Date:      2011-02-04 17:29 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/a775b8d3fed0

Merge

- src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.8.properties
- src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties

Changeset: b0bd638036bd
Author:    vinnie
Date:      2011-02-07 09:11 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/b0bd638036bd

7017486: Need synchronized access when flushing the LDAP request queue
Reviewed-by: alanb

! src/share/classes/com/sun/jndi/ldap/Connection.java

Changeset: f34dcfeecc8d
Author:    alanb
Date:      2011-02-07 13:53 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/f34dcfeecc8d

7012823: TEST_BUG: java/nio/MappedByteBuffer tests leave file mappingsthat prevent clean-up (win)
Reviewed-by: forax

! test/java/nio/MappedByteBuffer/Force.java
! test/java/nio/MappedByteBuffer/ZeroMap.java

Changeset: 32f1c5f67aae
Author:    alanb
Date:      2011-02-07 13:55 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/32f1c5f67aae

7003155: (fs) Paths.get(<file-uri>) does not handle escaped octets correctly
Reviewed-by: sherman

! src/solaris/classes/sun/nio/fs/UnixUriUtils.java
! test/java/nio/file/Path/UriImportExport.java

Changeset: 94bcd9aa2119
Author:    chegar
Date:      2011-02-07 14:08 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/94bcd9aa2119

7016898: PlainSocketImpl.fd is null on Windows
Reviewed-by: alanb

! src/windows/classes/java/net/PlainSocketImpl.java

Changeset: f9f321a7502c
Author:    alanb
Date:      2011-02-07 18:01 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/f9f321a7502c

7017454: Residual warnings in sun/nio/** and java/io native code (win64)
Reviewed-by: chegar

! src/share/native/java/io/io_util.c
! src/windows/native/java/io/WinNTFileSystem_md.c
! src/windows/native/java/io/canonicalize_md.c
! src/windows/native/java/io/io_util_md.c
! src/windows/native/sun/nio/ch/Iocp.c
! src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c
! src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c

Changeset: 08e1914d5852
Author:    alanb
Date:      2011-02-07 18:02 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/08e1914d5852

Merge


Changeset: 947ce00ed7a2
Author:    alanb
Date:      2011-02-08 15:50 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/947ce00ed7a2

7013585: Dual-pivot quicksort improvements for highly structured (nearly sorted) and data with small periods
Reviewed-by: mduigou, alanb
Contributed-by: vladimir.yaroslavskiy at oracle.com

! src/share/classes/java/util/DualPivotQuicksort.java
! test/java/util/Arrays/Sorting.java

Changeset: 82c8c54ac1d5
Author:    alanb
Date:      2011-02-08 19:31 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/82c8c54ac1d5

4421494: infinite loop while parsing double literal
Reviewed-by: darcy, alanb
Contributed-by: dmitry.nadezhin at oracle.com

! src/share/classes/sun/misc/FloatingDecimal.java
! test/java/lang/Double/ParseDouble.java

Changeset: 6661a1dfa369
Author:    sherman
Date:      2011-02-08 13:30 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/6661a1dfa369

7017840: (zipfs) test/demo/zipfs/basic.sh needs to be updated due to 7013420
Summary: updated try-with-resourcse usage in test/demo code
Reviewed-by: alanb

! src/share/demo/nio/zipfs/Demo.java
! test/demo/zipfs/ZipFSTester.java
! test/demo/zipfs/basic.sh

Changeset: 1899523d8f24
Author:    lana
Date:      2011-02-08 14:25 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/1899523d8f24

Merge

- src/share/classes/java/io/TempFileHelper.java
- src/share/classes/java/nio/file/FileRef.java
- src/share/classes/java/nio/file/attribute/Attributes.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java
- src/share/demo/zipfs
- test/java/nio/file/Files/ContentType.java
- test/java/nio/file/Files/CreateFileTree.java
- test/java/nio/file/Files/ForceLoad.java
- test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector
- test/java/nio/file/Files/MaxDepth.java
- test/java/nio/file/Files/PrintFileTree.java
- test/java/nio/file/Files/SimpleFileTypeDetector.java
- test/java/nio/file/Files/SkipSiblings.java
- test/java/nio/file/Files/TerminateWalk.java
- test/java/nio/file/Files/WalkWithSecurity.java
- test/java/nio/file/Files/denyAll.policy
- test/java/nio/file/Files/grantAll.policy
- test/java/nio/file/Files/grantTopOnly.policy
- test/java/nio/file/Files/walk_file_tree.sh
- test/java/nio/file/Path/CheckPermissions.java
- test/java/nio/file/Path/CopyAndMove.java
- test/java/nio/file/Path/DeleteOnClose.java
- test/java/nio/file/Path/FileAttributes.java
- test/java/nio/file/Path/InterruptCopy.java
- test/java/nio/file/Path/Links.java
- test/java/nio/file/Path/PassThroughFileSystem.java
- test/java/nio/file/Path/SBC.java
- test/java/nio/file/Path/TemporaryFiles.java
- test/java/nio/file/Path/delete_on_close.sh
- test/java/nio/file/attribute/FileStoreAttributeView/Basic.java

Changeset: cd9a302f2806
Author:    chegar
Date:      2011-02-09 09:53 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/cd9a302f2806

7013961: Threads attached via JNI attach prevent daemon ThreadGroups from being destroyed
Reviewed-by: dholmes

! src/share/classes/java/lang/Thread.java
! src/share/classes/java/lang/ThreadGroup.java

Changeset: 6a274c4d3e00
Author:    alanb
Date:      2011-02-09 15:59 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/6a274c4d3e00

7018258: Dual-pivot updates in 7013585 can fail with ArrayIndexOutOfBoundsException
Reviewed-by: alanb
Contributed-by: vladimir.yaroslavskiy at oracle.com

! src/share/classes/java/util/DualPivotQuicksort.java
! test/java/util/Arrays/Sorting.java

Changeset: 37563c09305d
Author:    alanb
Date:      2011-02-09 16:30 +0000
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/37563c09305d

Merge


Changeset: a8fcaf5097ec
Author:    lana
Date:      2011-02-09 10:28 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/a8fcaf5097ec

Merge


Changeset: 9d141e45ee4b
Author:    lana
Date:      2011-02-14 16:30 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/9d141e45ee4b

Merge

- src/share/classes/java/io/TempFileHelper.java
- src/share/classes/java/nio/file/FileRef.java
- src/share/classes/java/nio/file/attribute/Attributes.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java
- src/share/demo/zipfs
- test/java/nio/file/Files/ContentType.java
- test/java/nio/file/Files/CreateFileTree.java
- test/java/nio/file/Files/ForceLoad.java
- test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector
- test/java/nio/file/Files/MaxDepth.java
- test/java/nio/file/Files/PrintFileTree.java
- test/java/nio/file/Files/SimpleFileTypeDetector.java
- test/java/nio/file/Files/SkipSiblings.java
- test/java/nio/file/Files/TerminateWalk.java
- test/java/nio/file/Files/WalkWithSecurity.java
- test/java/nio/file/Files/denyAll.policy
- test/java/nio/file/Files/grantAll.policy
- test/java/nio/file/Files/grantTopOnly.policy
- test/java/nio/file/Files/walk_file_tree.sh
- test/java/nio/file/Path/CheckPermissions.java
- test/java/nio/file/Path/CopyAndMove.java
- test/java/nio/file/Path/DeleteOnClose.java
- test/java/nio/file/Path/FileAttributes.java
- test/java/nio/file/Path/InterruptCopy.java
- test/java/nio/file/Path/Links.java
- test/java/nio/file/Path/PassThroughFileSystem.java
- test/java/nio/file/Path/SBC.java
- test/java/nio/file/Path/TemporaryFiles.java
- test/java/nio/file/Path/delete_on_close.sh
- test/java/nio/file/attribute/FileStoreAttributeView/Basic.java

Changeset: e4802c87e5c7
Author:    herrick
Date:      2011-02-09 09:19 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/e4802c87e5c7

7016724: Remove sun.jkernel.* classes in JDK 7
Summary: Remove sun.jkernel.* classes in JDK 7
Reviewed-by: ohair, alanb, mchung

! make/modules/modules.config
! make/sun/Makefile
- make/sun/jkernel/FILES_c_windows.gmk
- make/sun/jkernel/FILES_java.gmk
- make/sun/jkernel/Makefile
! src/share/classes/java/awt/color/ICC_Profile.java
! src/share/classes/java/util/zip/ZipEntry.java
- src/share/classes/sun/jkernel/BackgroundDownloader.java
- src/share/classes/sun/jkernel/Bundle.java
- src/share/classes/sun/jkernel/BundleCheck.java
- src/share/classes/sun/jkernel/ByteArrayToFromHexDigits.java
- src/share/classes/sun/jkernel/DigestOutputStream.java
- src/share/classes/sun/jkernel/DownloadManager.java
- src/share/classes/sun/jkernel/KernelError.java
- src/share/classes/sun/jkernel/Mutex.java
- src/share/classes/sun/jkernel/StandaloneByteArrayAccess.java
- src/share/classes/sun/jkernel/StandaloneMessageDigest.java
- src/share/classes/sun/jkernel/StandaloneSHA.java
! src/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java
! src/share/classes/sun/misc/BootClassLoaderHook.java
! src/share/classes/sun/tools/attach/HotSpotAttachProvider.java
! src/windows/bin/java_md.c
- src/windows/native/sun/jkernel/DownloadDialog.cpp
- src/windows/native/sun/jkernel/DownloadDialog.h
- src/windows/native/sun/jkernel/DownloadHelper.cpp
- src/windows/native/sun/jkernel/DownloadHelper.h
- src/windows/native/sun/jkernel/graphics/bullet.bmp
- src/windows/native/sun/jkernel/graphics/cautionshield32.bmp
- src/windows/native/sun/jkernel/graphics/java-icon.ico
- src/windows/native/sun/jkernel/graphics/masthead.bmp
- src/windows/native/sun/jkernel/graphics/warningmasthead.bmp
- src/windows/native/sun/jkernel/kernel.cpp
- src/windows/native/sun/jkernel/kernel.def
- src/windows/native/sun/jkernel/kernel.h
- src/windows/native/sun/jkernel/kernel.rc
- src/windows/native/sun/jkernel/kernel_de.rc
- src/windows/native/sun/jkernel/kernel_en.rc
- src/windows/native/sun/jkernel/kernel_es.rc
- src/windows/native/sun/jkernel/kernel_fr.rc
- src/windows/native/sun/jkernel/kernel_it.rc
- src/windows/native/sun/jkernel/kernel_ja.rc
- src/windows/native/sun/jkernel/kernel_ko.rc
- src/windows/native/sun/jkernel/kernel_pt_BR.rc
- src/windows/native/sun/jkernel/kernel_sv.rc
- src/windows/native/sun/jkernel/kernel_zh.rc
- src/windows/native/sun/jkernel/kernel_zh_TW.rc
- src/windows/native/sun/jkernel/resource.h
- src/windows/native/sun/jkernel/stdafx.cpp
- src/windows/native/sun/jkernel/stdafx.h
- src/windows/native/sun/jkernel/version.rc

Changeset: dc909d130397
Author:    herrick
Date:      2011-02-09 09:32 -0500
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/dc909d130397

Merge

- make/java/hpi/Makefile
- make/java/hpi/hpi_common.gmk
- make/java/hpi/native/Makefile
- make/java/hpi/native/mapfile-vers
- make/java/hpi/native/reorder-i586
- make/java/hpi/native/reorder-sparc
- make/java/hpi/native/reorder-sparcv9
- make/java/hpi/windows/Makefile
- src/share/hpi/export/bool.h
- src/share/hpi/export/dll.h
- src/share/hpi/export/hpi.h
- src/share/hpi/include/hpi_impl.h
- src/share/hpi/include/vm_calls.h
- src/share/hpi/src/hpi.c
- src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.8.properties
- src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties
- src/solaris/hpi/export/byteorder_md.h
- src/solaris/hpi/export/hpi_md.h
- src/solaris/hpi/export/io_md.h
- src/solaris/hpi/export/path_md.h
- src/solaris/hpi/export/timeval_md.h
- src/solaris/hpi/include/hpi_init.h
- src/solaris/hpi/include/interrupt.h
- src/solaris/hpi/include/largefile.h
- src/solaris/hpi/include/largefile_linux.h
- src/solaris/hpi/include/largefile_solaris.h
- src/solaris/hpi/native_threads/include/condvar_md.h
- src/solaris/hpi/native_threads/include/monitor_md.h
- src/solaris/hpi/native_threads/include/mutex_md.h
- src/solaris/hpi/native_threads/include/np.h
- src/solaris/hpi/native_threads/include/porting.h
- src/solaris/hpi/native_threads/include/threads_md.h
- src/solaris/hpi/native_threads/src/condvar_md.c
- src/solaris/hpi/native_threads/src/interrupt_md.c
- src/solaris/hpi/native_threads/src/monitor_md.c
- src/solaris/hpi/native_threads/src/mutex_md.c
- src/solaris/hpi/native_threads/src/sys_api_td.c
- src/solaris/hpi/native_threads/src/threads_linux.c
- src/solaris/hpi/native_threads/src/threads_md.c
- src/solaris/hpi/native_threads/src/threads_solaris.c
- src/solaris/hpi/src/interrupt.c
- src/solaris/hpi/src/linker_md.c
- src/solaris/hpi/src/memory_md.c
- src/solaris/hpi/src/system_md.c
- src/windows/hpi/export/byteorder_md.h
- src/windows/hpi/export/hpi_md.h
- src/windows/hpi/export/io_md.h
- src/windows/hpi/export/path_md.h
- src/windows/hpi/export/timeval_md.h
- src/windows/hpi/include/monitor_md.h
- src/windows/hpi/include/mutex_md.h
- src/windows/hpi/include/threads_md.h
- src/windows/hpi/src/linker_md.c
- src/windows/hpi/src/memory_md.c
- src/windows/hpi/src/monitor_md.c
- src/windows/hpi/src/path_md.c
- src/windows/hpi/src/socket_md.c
- src/windows/hpi/src/sys_api_md.c
- src/windows/hpi/src/system_md.c
- src/windows/hpi/src/threads_md.c
- test/java/net/InetAddress/B4762344.java
- test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/java/net/InetAddress/Simple1NameServiceDescriptor.java
- test/java/net/InetAddress/Simple2NameServiceDescriptor.java
- test/java/net/InetAddress/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/B6442088.java
- test/sun/net/InetAddress/nameservice/CacheTest.java
- test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
- test/sun/net/InetAddress/nameservice/SimpleNameService.java
- test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java

Changeset: 4f84cda2a7d5
Author:    igor
Date:      2011-02-09 21:20 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/4f84cda2a7d5

Merge

- make/sun/jkernel/FILES_c_windows.gmk
- make/sun/jkernel/FILES_java.gmk
- make/sun/jkernel/Makefile
- src/share/classes/sun/jkernel/BackgroundDownloader.java
- src/share/classes/sun/jkernel/Bundle.java
- src/share/classes/sun/jkernel/BundleCheck.java
- src/share/classes/sun/jkernel/ByteArrayToFromHexDigits.java
- src/share/classes/sun/jkernel/DigestOutputStream.java
- src/share/classes/sun/jkernel/DownloadManager.java
- src/share/classes/sun/jkernel/KernelError.java
- src/share/classes/sun/jkernel/Mutex.java
- src/share/classes/sun/jkernel/StandaloneByteArrayAccess.java
- src/share/classes/sun/jkernel/StandaloneMessageDigest.java
- src/share/classes/sun/jkernel/StandaloneSHA.java
- src/windows/native/sun/jkernel/DownloadDialog.cpp
- src/windows/native/sun/jkernel/DownloadDialog.h
- src/windows/native/sun/jkernel/DownloadHelper.cpp
- src/windows/native/sun/jkernel/DownloadHelper.h
- src/windows/native/sun/jkernel/graphics/bullet.bmp
- src/windows/native/sun/jkernel/graphics/cautionshield32.bmp
- src/windows/native/sun/jkernel/graphics/java-icon.ico
- src/windows/native/sun/jkernel/graphics/masthead.bmp
- src/windows/native/sun/jkernel/graphics/warningmasthead.bmp
- src/windows/native/sun/jkernel/kernel.cpp
- src/windows/native/sun/jkernel/kernel.def
- src/windows/native/sun/jkernel/kernel.h
- src/windows/native/sun/jkernel/kernel.rc
- src/windows/native/sun/jkernel/kernel_de.rc
- src/windows/native/sun/jkernel/kernel_en.rc
- src/windows/native/sun/jkernel/kernel_es.rc
- src/windows/native/sun/jkernel/kernel_fr.rc
- src/windows/native/sun/jkernel/kernel_it.rc
- src/windows/native/sun/jkernel/kernel_ja.rc
- src/windows/native/sun/jkernel/kernel_ko.rc
- src/windows/native/sun/jkernel/kernel_pt_BR.rc
- src/windows/native/sun/jkernel/kernel_sv.rc
- src/windows/native/sun/jkernel/kernel_zh.rc
- src/windows/native/sun/jkernel/kernel_zh_TW.rc
- src/windows/native/sun/jkernel/resource.h
- src/windows/native/sun/jkernel/stdafx.cpp
- src/windows/native/sun/jkernel/stdafx.h
- src/windows/native/sun/jkernel/version.rc

Changeset: 802c085308bf
Author:    igor
Date:      2011-02-15 19:16 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/802c085308bf

Merge

- src/share/classes/java/io/TempFileHelper.java
- src/share/classes/java/nio/file/FileRef.java
- src/share/classes/java/nio/file/attribute/Attributes.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java
- src/share/demo/zipfs
- test/java/nio/file/Files/ContentType.java
- test/java/nio/file/Files/CreateFileTree.java
- test/java/nio/file/Files/ForceLoad.java
- test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector
- test/java/nio/file/Files/MaxDepth.java
- test/java/nio/file/Files/PrintFileTree.java
- test/java/nio/file/Files/SimpleFileTypeDetector.java
- test/java/nio/file/Files/SkipSiblings.java
- test/java/nio/file/Files/TerminateWalk.java
- test/java/nio/file/Files/WalkWithSecurity.java
- test/java/nio/file/Files/denyAll.policy
- test/java/nio/file/Files/grantAll.policy
- test/java/nio/file/Files/grantTopOnly.policy
- test/java/nio/file/Files/walk_file_tree.sh
- test/java/nio/file/Path/CheckPermissions.java
- test/java/nio/file/Path/CopyAndMove.java
- test/java/nio/file/Path/DeleteOnClose.java
- test/java/nio/file/Path/FileAttributes.java
- test/java/nio/file/Path/InterruptCopy.java
- test/java/nio/file/Path/Links.java
- test/java/nio/file/Path/PassThroughFileSystem.java
- test/java/nio/file/Path/SBC.java
- test/java/nio/file/Path/TemporaryFiles.java
- test/java/nio/file/Path/delete_on_close.sh
- test/java/nio/file/attribute/FileStoreAttributeView/Basic.java

Changeset: 7bb09178ffc7
Author:    ohair
Date:      2011-02-10 20:45 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/7bb09178ffc7

7012644: Regression: jdk/make/common/shared/Defs-windows.gmk has problems on cygwin
7018835: Debug build issues in jdk makefiles
Reviewed-by: ksrini

! make/common/shared/Defs-windows.gmk
! make/common/shared/Defs.gmk
! make/common/shared/Platform.gmk

Changeset: 9478964f9425
Author:    ohair
Date:      2011-02-10 20:51 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/9478964f9425

Merge


Changeset: 71b52ce5f389
Author:    mfang
Date:      2011-02-10 20:52 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/71b52ce5f389

7017734: jdk7 message drop 1 translation integration
Reviewed-by: ogino, yhuang

! src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties
! src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties
! src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties
! src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties
! src/share/classes/com/sun/accessibility/internal/resources/accessibility_ja.properties
! src/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties
! src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties
! src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties
! src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties
! src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties
! src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.properties
! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties
! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties
! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_fr.properties
! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties
! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties
! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties
! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_pt_BR.properties
! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties
! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties
! src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties
! src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties
! src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties
! src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties
! src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties
! src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ja.properties
! src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties
! src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties
! src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties
! src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties
! src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties
! src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties
! src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties
! src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties
! src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties
! src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java
! src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java
! src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties
! src/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties
! src/share/classes/sun/applet/resources/MsgAppletViewer_de.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_es.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_fr.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_it.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_ko.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
! src/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java
! src/share/classes/sun/awt/resources/awt_de.properties
! src/share/classes/sun/awt/resources/awt_es.properties
! src/share/classes/sun/awt/resources/awt_fr.properties
! src/share/classes/sun/awt/resources/awt_it.properties
! src/share/classes/sun/awt/resources/awt_ja.properties
! src/share/classes/sun/awt/resources/awt_ko.properties
! src/share/classes/sun/awt/resources/awt_pt_BR.properties
! src/share/classes/sun/awt/resources/awt_sv.properties
! src/share/classes/sun/awt/resources/awt_zh_CN.properties
! src/share/classes/sun/awt/resources/awt_zh_TW.properties
! src/share/classes/sun/management/resources/agent_de.properties
! src/share/classes/sun/management/resources/agent_es.properties
! src/share/classes/sun/management/resources/agent_fr.properties
! src/share/classes/sun/management/resources/agent_it.properties
! src/share/classes/sun/management/resources/agent_ja.properties
! src/share/classes/sun/management/resources/agent_ko.properties
! src/share/classes/sun/management/resources/agent_pt_BR.properties
! src/share/classes/sun/management/resources/agent_sv.properties
! src/share/classes/sun/management/resources/agent_zh_CN.properties
! src/share/classes/sun/management/resources/agent_zh_TW.properties
! src/share/classes/sun/misc/resources/Messages_de.java
! src/share/classes/sun/misc/resources/Messages_es.java
! src/share/classes/sun/misc/resources/Messages_fr.java
! src/share/classes/sun/misc/resources/Messages_it.java
! src/share/classes/sun/misc/resources/Messages_ja.java
! src/share/classes/sun/misc/resources/Messages_ko.java
! src/share/classes/sun/misc/resources/Messages_pt_BR.java
! src/share/classes/sun/misc/resources/Messages_sv.java
! src/share/classes/sun/misc/resources/Messages_zh_CN.java
! src/share/classes/sun/misc/resources/Messages_zh_TW.java
! src/share/classes/sun/print/resources/serviceui_de.properties
! src/share/classes/sun/print/resources/serviceui_es.properties
! src/share/classes/sun/print/resources/serviceui_fr.properties
! src/share/classes/sun/print/resources/serviceui_it.properties
! src/share/classes/sun/print/resources/serviceui_ja.properties
! src/share/classes/sun/print/resources/serviceui_ko.properties
! src/share/classes/sun/print/resources/serviceui_pt_BR.properties
! src/share/classes/sun/print/resources/serviceui_sv.properties
! src/share/classes/sun/print/resources/serviceui_zh_CN.properties
! src/share/classes/sun/print/resources/serviceui_zh_TW.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties
! src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties
! src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties
! src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties
! src/share/classes/sun/rmi/server/resources/rmid_de.properties
! src/share/classes/sun/rmi/server/resources/rmid_es.properties
! src/share/classes/sun/rmi/server/resources/rmid_fr.properties
! src/share/classes/sun/rmi/server/resources/rmid_it.properties
! src/share/classes/sun/rmi/server/resources/rmid_ja.properties
! src/share/classes/sun/rmi/server/resources/rmid_ko.properties
! src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties
! src/share/classes/sun/rmi/server/resources/rmid_sv.properties
! src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties
! src/share/classes/sun/rmi/server/resources/rmid_zh_TW.properties
! src/share/classes/sun/security/tools/JarSignerResources_ja.java
! src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java
! src/share/classes/sun/security/util/AuthResources_de.java
! src/share/classes/sun/security/util/AuthResources_es.java
! src/share/classes/sun/security/util/AuthResources_fr.java
! src/share/classes/sun/security/util/AuthResources_it.java
! src/share/classes/sun/security/util/AuthResources_ja.java
! src/share/classes/sun/security/util/AuthResources_ko.java
! src/share/classes/sun/security/util/AuthResources_pt_BR.java
! src/share/classes/sun/security/util/AuthResources_sv.java
! src/share/classes/sun/security/util/AuthResources_zh_CN.java
! src/share/classes/sun/security/util/AuthResources_zh_TW.java
! src/share/classes/sun/security/util/Resources_de.java
! src/share/classes/sun/security/util/Resources_es.java
! src/share/classes/sun/security/util/Resources_fr.java
! src/share/classes/sun/security/util/Resources_it.java
! src/share/classes/sun/security/util/Resources_ja.java
! src/share/classes/sun/security/util/Resources_ko.java
! src/share/classes/sun/security/util/Resources_pt_BR.java
! src/share/classes/sun/security/util/Resources_sv.java
! src/share/classes/sun/security/util/Resources_zh_CN.java
! src/share/classes/sun/security/util/Resources_zh_TW.java
! src/share/classes/sun/tools/jar/resources/jar_de.properties
! src/share/classes/sun/tools/jar/resources/jar_es.properties
! src/share/classes/sun/tools/jar/resources/jar_fr.properties
! src/share/classes/sun/tools/jar/resources/jar_it.properties
! src/share/classes/sun/tools/jar/resources/jar_ja.properties
! src/share/classes/sun/tools/jar/resources/jar_ko.properties
! src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties
! src/share/classes/sun/tools/jar/resources/jar_sv.properties
! src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties
! src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties
! src/share/classes/sun/tools/javac/resources/javac_ja.properties
! src/share/classes/sun/tools/javac/resources/javac_zh_CN.properties
! src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java
! src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java
! src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java
! src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java
! src/share/classes/sun/tools/serialver/serialver_ja.properties
! src/share/classes/sun/tools/serialver/serialver_zh_CN.properties
! src/share/classes/sun/util/logging/resources/logging_de.properties
! src/share/classes/sun/util/logging/resources/logging_es.properties
! src/share/classes/sun/util/logging/resources/logging_fr.properties
! src/share/classes/sun/util/logging/resources/logging_it.properties
! src/share/classes/sun/util/logging/resources/logging_ja.properties
! src/share/classes/sun/util/logging/resources/logging_ko.properties
! src/share/classes/sun/util/logging/resources/logging_pt_BR.properties
! src/share/classes/sun/util/logging/resources/logging_sv.properties
! src/share/classes/sun/util/logging/resources/logging_zh_CN.properties
! src/share/classes/sun/util/logging/resources/logging_zh_TW.properties
! src/share/demo/jfc/CodePointIM/resources/codepoint_ja.properties
! src/share/demo/jfc/CodePointIM/resources/codepoint_zh_CN.properties
! src/share/demo/jfc/Font2DTest/resources/TextResources_ja.properties
! src/share/demo/jfc/Font2DTest/resources/TextResources_zh_CN.properties
! src/share/demo/jfc/Notepad/resources/Notepad_ja.properties
! src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties
! src/windows/classes/sun/awt/windows/awtLocalization_es.properties
! src/windows/classes/sun/awt/windows/awtLocalization_ja.properties
! src/windows/classes/sun/awt/windows/awtLocalization_ko.properties
! src/windows/classes/sun/awt/windows/awtLocalization_pt_BR.properties
! src/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties
! src/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties
! src/windows/native/sun/jkernel/kernel_de.rc
! src/windows/native/sun/jkernel/kernel_es.rc
! src/windows/native/sun/jkernel/kernel_fr.rc
! src/windows/native/sun/jkernel/kernel_it.rc
! src/windows/native/sun/jkernel/kernel_ja.rc
! src/windows/native/sun/jkernel/kernel_ko.rc
! src/windows/native/sun/jkernel/kernel_pt_BR.rc
! src/windows/native/sun/jkernel/kernel_sv.rc
! src/windows/native/sun/jkernel/kernel_zh.rc
! src/windows/native/sun/jkernel/kernel_zh_TW.rc

Changeset: 8b6d1d96ef3d
Author:    mfang
Date:      2011-02-11 22:57 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/8b6d1d96ef3d

Merge


Changeset: 0eacbbc8e1fb
Author:    mfang
Date:      2011-02-11 23:46 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/0eacbbc8e1fb

Merge


Changeset: 780e53ad2896
Author:    mfang
Date:      2011-02-14 13:01 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/780e53ad2896

Merge


Changeset: 5fab973e5a47
Author:    ohair
Date:      2011-02-15 12:34 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/5fab973e5a47

Merge


Changeset: bdc069d3f910
Author:    ohair
Date:      2011-02-15 20:18 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/bdc069d3f910

Merge


Changeset: 89055b6d9ae0
Author:    cl
Date:      2011-02-18 14:23 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/89055b6d9ae0

Added tag jdk7-b130 for changeset bdc069d3f910

! .hgtags

Changeset: 864b669d54d8
Author:    lana
Date:      2011-02-21 19:43 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/864b669d54d8

Merge

- make/sun/jkernel/FILES_c_windows.gmk
- make/sun/jkernel/FILES_java.gmk
- make/sun/jkernel/Makefile
- src/share/classes/java/io/TempFileHelper.java
- src/share/classes/java/nio/file/FileRef.java
- src/share/classes/java/nio/file/attribute/Attributes.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java
- src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java
- src/share/classes/sun/jkernel/BackgroundDownloader.java
- src/share/classes/sun/jkernel/Bundle.java
- src/share/classes/sun/jkernel/BundleCheck.java
- src/share/classes/sun/jkernel/ByteArrayToFromHexDigits.java
- src/share/classes/sun/jkernel/DigestOutputStream.java
- src/share/classes/sun/jkernel/DownloadManager.java
- src/share/classes/sun/jkernel/KernelError.java
- src/share/classes/sun/jkernel/Mutex.java
- src/share/classes/sun/jkernel/StandaloneByteArrayAccess.java
- src/share/classes/sun/jkernel/StandaloneMessageDigest.java
- src/share/classes/sun/jkernel/StandaloneSHA.java
- src/share/demo/zipfs
- src/windows/native/sun/jkernel/DownloadDialog.cpp
- src/windows/native/sun/jkernel/DownloadDialog.h
- src/windows/native/sun/jkernel/DownloadHelper.cpp
- src/windows/native/sun/jkernel/DownloadHelper.h
- src/windows/native/sun/jkernel/graphics/bullet.bmp
- src/windows/native/sun/jkernel/graphics/cautionshield32.bmp
- src/windows/native/sun/jkernel/graphics/java-icon.ico
- src/windows/native/sun/jkernel/graphics/masthead.bmp
- src/windows/native/sun/jkernel/graphics/warningmasthead.bmp
- src/windows/native/sun/jkernel/kernel.cpp
- src/windows/native/sun/jkernel/kernel.def
- src/windows/native/sun/jkernel/kernel.h
- src/windows/native/sun/jkernel/kernel.rc
- src/windows/native/sun/jkernel/kernel_de.rc
- src/windows/native/sun/jkernel/kernel_en.rc
- src/windows/native/sun/jkernel/kernel_es.rc
- src/windows/native/sun/jkernel/kernel_fr.rc
- src/windows/native/sun/jkernel/kernel_it.rc
- src/windows/native/sun/jkernel/kernel_ja.rc
- src/windows/native/sun/jkernel/kernel_ko.rc
- src/windows/native/sun/jkernel/kernel_pt_BR.rc
- src/windows/native/sun/jkernel/kernel_sv.rc
- src/windows/native/sun/jkernel/kernel_zh.rc
- src/windows/native/sun/jkernel/kernel_zh_TW.rc
- src/windows/native/sun/jkernel/resource.h
- src/windows/native/sun/jkernel/stdafx.cpp
- src/windows/native/sun/jkernel/stdafx.h
- src/windows/native/sun/jkernel/version.rc
- test/java/nio/file/Files/ContentType.java
- test/java/nio/file/Files/CreateFileTree.java
- test/java/nio/file/Files/ForceLoad.java
- test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector
- test/java/nio/file/Files/MaxDepth.java
- test/java/nio/file/Files/PrintFileTree.java
- test/java/nio/file/Files/SimpleFileTypeDetector.java
- test/java/nio/file/Files/SkipSiblings.java
- test/java/nio/file/Files/TerminateWalk.java
- test/java/nio/file/Files/WalkWithSecurity.java
- test/java/nio/file/Files/denyAll.policy
- test/java/nio/file/Files/grantAll.policy
- test/java/nio/file/Files/grantTopOnly.policy
- test/java/nio/file/Files/walk_file_tree.sh
- test/java/nio/file/Path/CheckPermissions.java
- test/java/nio/file/Path/CopyAndMove.java
- test/java/nio/file/Path/DeleteOnClose.java
- test/java/nio/file/Path/FileAttributes.java
- test/java/nio/file/Path/InterruptCopy.java
- test/java/nio/file/Path/Links.java
- test/java/nio/file/Path/PassThroughFileSystem.java
- test/java/nio/file/Path/SBC.java
- test/java/nio/file/Path/TemporaryFiles.java
- test/java/nio/file/Path/delete_on_close.sh
- test/java/nio/file/attribute/FileStoreAttributeView/Basic.java



From philip.race at oracle.com  Fri Feb 25 12:22:05 2011
From: philip.race at oracle.com (Phil Race)
Date: Fri, 25 Feb 2011 12:22:05 -0800
Subject: [OpenJDK 2D-Dev] code review minor xrender fixes
Message-ID: <4D680F6D.1090702@oracle.com>

Clemens,

We found some potential non-serious memory leaks in the xrender code.
But worth cleaning up anyway.
Can you review my fix : http://cr.openjdk.java.net/~prr/7004728/

-phil.


From linuxhippy at gmail.com  Sat Feb 26 11:07:26 2011
From: linuxhippy at gmail.com (Clemens Eisserer)
Date: Sat, 26 Feb 2011 20:07:26 +0100
Subject: [OpenJDK 2D-Dev] code review minor xrender fixes
In-Reply-To: <4D680F6D.1090702@oracle.com>
References: <4D680F6D.1090702@oracle.com>
Message-ID: <AANLkTinUKGRefMV1o0aGB0rn_tNEGh_U2LJqBWZBF5t3@mail.gmail.com>

Hi Phil,


> We found some potential non-serious memory leaks in the xrender code.
> But worth cleaning up anyway.
> Can you review my fix : http://cr.openjdk.java.net/~prr/7004728/

Looks good.
Thanks for fixing those leaks :)

Thanks, Clemens


From philip.race at oracle.com  Mon Feb 28 10:25:11 2011
From: philip.race at oracle.com (philip.race at oracle.com)
Date: Mon, 28 Feb 2011 18:25:11 +0000
Subject: [OpenJDK 2D-Dev] hg: jdk7/2d/jdk: 7004728: [parfait] potential
	memory leaks in XRender	code
Message-ID: <20110228182544.1AF3E47B1C@hg.openjdk.java.net>

Changeset: 196d6e802721
Author:    prr
Date:      2011-02-28 10:25 -0800
URL:       http://hg.openjdk.java.net/jdk7/2d/jdk/rev/196d6e802721

7004728: [parfait] potential memory leaks in XRender code
Reviewed-by: bae, ceisserer

! src/solaris/native/sun/java2d/x11/XRBackendNative.c