29164 Commits

Author SHA1 Message Date
Jennifer Godinez
271bfc2715 Merge 2011-05-09 12:32:40 -07:00
Jennifer Godinez
1c21c0f406 Merge 2011-05-09 12:26:53 -07:00
Alan Bateman
67fd9e16ef Merge 2011-05-09 18:53:57 +01:00
Alan Bateman
914105d32e 7042979: Rename StandardSocketOption and StandardWatchEventKind
Reviewed-by: forax, chegar
2011-05-09 18:45:33 +01:00
Mike Duigou
8b1efebaa1 7043104: disable test java/lang/invoke/InvokeDynamicPrintArgs.java
Reviewed-by: alanb
2011-05-09 09:13:47 -07:00
Mike Duigou
66f7633b48 Merge 2011-05-09 08:58:00 -07:00
Doug Lea
25ec11dfe6 7042673: LockSupport.getBlocker(null) crashes
Reviewed-by: chegar
2011-05-09 16:36:20 +01:00
Vinnie Ryan
691c55d04a 6987652: VM crashed in sun.security.mscapi.RSAKeyPairGenerator.generateRSAKeyPair(...)
Reviewed-by: alanb
2011-05-09 15:58:25 +01:00
Alan Bateman
6ca19f3995 Merge 2011-05-09 01:57:53 -07:00
Alan Bateman
ca08676916 Merge 2011-05-09 01:57:28 -07:00
Alan Bateman
473f41e4e3 Merge 2011-05-09 01:56:24 -07:00
Alan Bateman
03fbf449cd Merge 2011-05-09 01:47:05 -07:00
Tom Rodriguez
9b9953cb0b Merge 2011-05-06 19:34:55 -07:00
Joe Darcy
d814ae14d1 7011326: Add informative example to @SafeVarargs type or language discussion
Reviewed-by: mcimadamore, mduigou
2011-05-06 17:06:25 -07:00
Tom Rodriguez
6aeaca98d1 6939861: JVM should handle more conversion operations
Reviewed-by: twisti, jrose
2011-05-06 16:33:13 -07:00
Kelly O'Hair
4c74378e6a Merge 2011-05-06 15:49:09 -07:00
Erik Trimble
63c85322b1 7040779: Bump the HS21 build number to 12
Update the HS21 build number to 12

Reviewed-by: jcoomes
2011-05-06 14:41:06 -07:00
Erik Trimble
cee74b9a63 Merge 2011-05-06 14:41:00 -07:00
Abhijit Saha
4e033ce5f2 Merge 2011-05-06 14:33:44 -07:00
Erik Trimble
b9851bd6eb Added tag hs21-b11 for changeset de80080e77a6 2011-05-06 14:10:20 -07:00
Igor Veresov
bb2c21a025 7042153: guarantee(x_compare_res != Constant::not_comparable) failed: incomparable constants in IfOp
Handle IfOps folding properly in case of unloaded constant oop arguments

Reviewed-by: kvn, never
2011-05-06 12:12:29 -07:00
Tom Rodriguez
b73681ae0c Merge 2011-05-06 11:36:25 -07:00
Kelly O'Hair
c940e5a884 Merge 2011-05-06 10:41:14 -07:00
Christine Lu
4a2870a449 Merge 2011-05-06 10:31:40 -07:00
Michael Fang
207f711ac2 7021691: Most log level words are not translated in java logging
Reviewed-by: yhuang
2011-05-06 10:07:42 -07:00
Frederic Parain
186fce71ec 7028071: Add two attributes to the OperatingSystemMXBean to provide CPU Load info
Add getProcessCpuLoad() and getSystemCpuLoad() to the OperatingSystemMXBean

Reviewed-by: acorn, dholmes, mchung
2011-05-06 18:09:33 +02:00
Keith McGuigan
cb6e2c12f4 Merge 2011-05-06 11:25:16 -04:00
Andrei Dmitriev
86b4b082bb 6894541: javax/swing/JTable/6788484/bug6788484.java fails w/ compilation errors
Reviewed-by: alexp
2011-05-06 16:01:17 +04:00
Bengt Rutisson
90ab9d500c Merge 2011-05-06 09:45:18 +02:00
Abhijit Saha
404fbff117 Merge 2011-05-05 22:30:15 -07:00
Abhijit Saha
92df2d2184 Merge 2011-05-05 22:29:05 -07:00
Abhijit Saha
2cce4d0d35 Merge 2011-05-05 22:28:31 -07:00
Vladimir Kozlov
8698030a91 7042327: assert(opaq->outcnt() == 1 && opaq->in(1) == limit)
Separate limit by Opaque2 node when calculating new limit for unrolled loop.

Reviewed-by: never
2011-05-05 21:06:14 -07:00
Andrew John Hughes
24b0b30f9e Merge 2011-05-06 02:27:10 +01:00
David Holmes
8553d963c0 7036525: Disable alternative source mechanism for OPENJDK builds
By default if OPENJDK=true is set then we don't look in the alt-src predefined location. The user can explicitly set HS_ALT_SRC_REL to the desired location in conjunction with OPENJDK=true, if they wish.

Reviewed-by: jcoomes, kamg
2011-05-05 21:20:21 -04:00
Christine Lu
e20a4c4a39 7026163: gzip tar files
Reviewed-by: katleman
2011-05-05 18:05:24 -07:00
Andrew John Hughes
6e40ce24d5 7042040: Remove disk space sanity check
Remove outdated disk space checks using df

Reviewed-by: ohair, omajid
2011-05-06 01:55:29 +01:00
Kelly O'Hair
e4fd8ee0ac Merge 2011-05-05 15:23:20 -07:00
Suchen Chien
eb1839a110 Added tag jdk7-b141 for changeset af4b2168b0f9 2011-05-05 14:02:30 -07:00
Suchen Chien
b56aedf465 Added tag jdk7-b141 for changeset 3d44ee873b9c 2011-05-05 14:02:17 -07:00
Suchen Chien
08faa8037b Added tag jdk7-b141 for changeset 76bb81c6327c 2011-05-05 14:02:11 -07:00
Suchen Chien
31d82bb88b Added tag jdk7-b141 for changeset cb7a3284b15b 2011-05-05 14:02:10 -07:00
Suchen Chien
e554c899e5 Added tag jdk7-b141 for changeset dbc77e0dc173 2011-05-05 14:02:02 -07:00
Suchen Chien
5af1de038e Added tag jdk7-b141 for changeset b24cc3620ee4 2011-05-05 14:01:57 -07:00
Suchen Chien
230aec2f49 Added tag jdk7-b141 for changeset 0f69dca4aa47 2011-05-05 14:01:55 -07:00
Keith McGuigan
d7fa132400 7033669: JVM TI spec has to be changed to not contain URLS to the VM Spec
Update JVMTI source files to remove hyperlinks and add full legal name

Reviewed-by: acorn, dcubed, dholmes
2011-05-05 12:50:42 -04:00
John Coomes
62a8508587 6728025: LinkResolver is missing some ResourceMarks
Reviewed-by: dholmes, coleenp, ysr, kamg
2011-05-05 07:51:05 -07:00
Kevin Walls
64fd535370 Merge 2011-05-05 09:33:14 -04:00
Antonios Printezis
e061c0b0a4 7040450: G1: assert((_g1->evacuation_failed()) || (!_g1->obj_in_cs(obj))) failed: shouldn't still be in ..
There is a race in the evac failure handling code that causes the condition the assert checks not to be true. The fix is to replace the too-strong assert with a more targeted one.

Reviewed-by: johnc, ysr, jcoomes
2011-05-05 09:15:52 -04:00
Vladimir Kozlov
9f0bca3b75 7042070: Typo in Test6796786.java
The test should compare with -0.0f.

Reviewed-by: never, iveresov
2011-05-04 22:41:17 -07:00