29164 Commits

Author SHA1 Message Date
Tom Rodriguez
b255b0eccc Merge 2012-03-09 08:34:36 -08:00
Karen Kinnear
a0e6b7797c Merge 2012-03-09 00:28:20 -05:00
David Katleman
7c2e062ccb Added tag jdk8-b29 for changeset cc866298b20c 2012-03-08 20:35:26 -08:00
David Katleman
dd9799aaa2 Added tag jdk8-b29 for changeset cad5cb628235 2012-03-08 20:35:09 -08:00
David Katleman
805065faa4 Added tag jdk8-b29 for changeset 756dbb31c9b0 2012-03-08 20:34:58 -08:00
David Katleman
545c4a7aa7 Added tag jdk8-b29 for changeset c7420b6abb44 2012-03-08 20:34:54 -08:00
David Katleman
9dfe7b710e Added tag jdk8-b29 for changeset 463281379d91 2012-03-08 20:34:29 -08:00
David Katleman
924af8d1c0 Added tag jdk8-b29 for changeset 9bf30f58c4bc 2012-03-08 20:34:25 -08:00
David Katleman
99d808ac37 Added tag jdk8-b29 for changeset c4fd9c6f75fb 2012-03-08 20:34:18 -08:00
Kelly O'Hair
9dad666a66 7152425: Fix copyright notices on 12 files in jaxws
Reviewed-by: mbykov
2012-03-08 18:20:15 -08:00
Lana Steuck
76177f7a48 Merge 2012-03-08 15:26:32 -08:00
Mike Duigou
bbd20b347d 7151595: Disable creation of db demos if NO_DEMOS is specified
Reviewed-by: weijun, dholmes
2012-03-08 13:44:33 -08:00
Lana Steuck
b5a0dffd57 Merge 2012-03-08 14:22:15 -08:00
Lana Steuck
086d1992b6 Merge 2012-03-08 08:19:58 -08:00
Lana Steuck
ac3052168c Merge 2012-03-08 08:18:56 -08:00
Joe Darcy
cf99e1e9f8 7151008: Add library support for repeating annotations in java.lang.annotation
Reviewed-by: mcimadamore, jjg
2012-03-08 08:04:52 -08:00
Michael McMahon
57a9560def 7152186: java.awt.HeadlessException when running AWT apps [macosx]
Reviewed-by: anthony
2012-03-08 14:38:26 +00:00
Daniel D. Daugherty
c8ff3bb0cc 7152206: anti-delta the fix for 7152031
Backout the fix for 7152031; the real bug to be fixed in jdk repo.

Reviewed-by: michaelm
2012-03-08 06:33:26 -08:00
Deepak Bhole
1ee1acb94f 7150392: Linux build breaks with GCC 4.7 due to unrecognized option
Remove -mimpure-text option.

Reviewed-by: ohair, dholmes, phh, andrew
2012-03-08 14:04:44 +00:00
Lana Steuck
69ee813add Merge 2012-03-07 22:40:20 -08:00
Lana Steuck
247874eb43 Merge 2012-03-07 22:36:43 -08:00
Lana Steuck
1a29d97330 Merge 2012-03-07 22:36:38 -08:00
David Holmes
7352937e75 7092140: Test: java/util/concurrent/locks/Lock/TimedAcquireLeak.java fails on SE-E due to -XX:-UsePerfData
Add -XX:+UsePerfData to invocation of exec'd JVM

Reviewed-by: alanb, chegar
2012-03-08 00:46:33 -05:00
Daniel D. Daugherty
ec59e22ec0 7152031: Hotspot needs updated xawt path [macosx]
Update to use the right path on MacOS X.

Reviewed-by: michaelm, jcoomes, amurillo
2012-03-07 14:58:17 -08:00
David Katleman
ebc31d93d9 Merge 2012-03-07 13:47:22 -08:00
David Katleman
1741706a00 Merge 2012-03-07 13:46:18 -08:00
David Katleman
15459fceae Merge 2012-03-07 13:45:18 -08:00
Michael Fang
1ca90839e4 Merge 2012-03-07 10:18:10 -08:00
Pavel Porvatov
304f1400f9 7146377: closed/javax/swing/DataTransfer/4876520/bug4876520.java failed since b08 in jdk 8
Reviewed-by: alexp
2012-03-07 20:07:18 +02:00
Alexander Scherbatiy
5f01fd2c54 7132808: [macosx] closed/javax/swing/JFileChooser/4524490/bug4524490.java fails on MacOS
Reviewed-by: alexp
2012-03-07 17:57:12 +04:00
Fredrik Öhrström
d74cd0bff8 7150579: Moved ant code into a separate package, anttasks
To allow langtools to be built without ant, the ant tasks were moved to a separated package. The packages were also renamed to proper lower case package names.

Reviewed-by: jjg
2012-03-07 13:11:27 +01:00
Weijun Wang
0bc11358bb 6961765: Double byte characters corrupted in DN for LDAP referrals
Reviewed-by: vinnie
2012-03-07 10:15:41 +08:00
Tom Rodriguez
9a93f60e34 7150390: JFR test crashed on assert(_jni_lock_count == count) failed: must be equal
Reviewed-by: dholmes, minqi, kvn, coleenp
2012-03-06 16:32:23 -08:00
Kelly O'Hair
bc113af571 7150322: Stop using drop source bundles in jaxws
Reviewed-by: darcy, ohrstrom
2012-03-06 16:09:35 -08:00
Alan Bateman
3269d85838 7113349: Initial changeset for Macosx port to jdk
Co-authored-by: Alexander Potochkin <alexander.potochkin@oracle.com>
Co-authored-by: Alexander Zuev <alexander.zuev@oracle.com>
Co-authored-by: Andrew Brygin <andrew.brygin@oracle.com>
Co-authored-by: Artem Ananiev <artem.ananiev@oracle.com>
Co-authored-by: Alex Strange <astrange@apple.com>
Co-authored-by: Bino George <bino@apple.com>
Co-authored-by: Christine Lu <christine.lu@oracle.com>
Co-authored-by: David Katleman <david.katleman@oracle.com>
Co-authored-by: David Durrence <david_durrence@apple.com>
Co-authored-by: Dmitry Cherepanov <dmitry.cherepanov@oracle.com>
Co-authored-by: Greg Lewis <glewis@eyesbeyond.com>
Co-authored-by: Kevin Miller <kevin_m_miller@apple.com>
Co-authored-by: Kurt Miller <kurt@intricatesoftware.com>
Co-authored-by: Landon Fuller <landonf@plausiblelabs.com>
Co-authored-by: Leonid Romanov <leonid.romanov@oracle.com>
Co-authored-by: Loefty Walkowiak <loefty@apple.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Naoto Sato <naoto.sato@oracle.com>
Co-authored-by: Philip Race <philip.race@oracle.com>
Co-authored-by: Roger Hoover <rhoover@apple.com>
Co-authored-by: Scott Kovatch <scott.kovatch@oracle.com>
Co-authored-by: Sergey ByloKhov <sergey.bylokhov@oracle.com>
Co-authored-by: Mike Swingler <swingler@apple.com>
Co-authored-by: Tomas Hurka <tomas.hurka@oracle.com>
Reviewed-by: jjh, alanb, dholmes, anthony, ohrstrom, ksrini, jrose, weijun, smarks
2012-03-06 20:34:38 +00:00
Alan Bateman
041b97af42 7113349: Initial changeset for Macosx port to jdk
Co-authored-by: Alexander Potochkin <alexander.potochkin@oracle.com>
Co-authored-by: Alexander Zuev <alexander.zuev@oracle.com>
Co-authored-by: Andrew Brygin <andrew.brygin@oracle.com>
Co-authored-by: Artem Ananiev <artem.ananiev@oracle.com>
Co-authored-by: Alex Strange <astrange@apple.com>
Co-authored-by: Bino George <bino@apple.com>
Co-authored-by: Christine Lu <christine.lu@oracle.com>
Co-authored-by: David Katleman <david.katleman@oracle.com>
Co-authored-by: David Durrence <david_durrence@apple.com>
Co-authored-by: Dmitry Cherepanov <dmitry.cherepanov@oracle.com>
Co-authored-by: Greg Lewis <glewis@eyesbeyond.com>
Co-authored-by: Kevin Miller <kevin_m_miller@apple.com>
Co-authored-by: Kurt Miller <kurt@intricatesoftware.com>
Co-authored-by: Landon Fuller <landonf@plausiblelabs.com>
Co-authored-by: Leonid Romanov <leonid.romanov@oracle.com>
Co-authored-by: Loefty Walkowiak <loefty@apple.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Naoto Sato <naoto.sato@oracle.com>
Co-authored-by: Philip Race <philip.race@oracle.com>
Co-authored-by: Roger Hoover <rhoover@apple.com>
Co-authored-by: Scott Kovatch <scott.kovatch@oracle.com>
Co-authored-by: Sergey ByloKhov <sergey.bylokhov@oracle.com>
Co-authored-by: Mike Swingler <swingler@apple.com>
Co-authored-by: Tomas Hurka <tomas.hurka@oracle.com>
Reviewed-by: jjh, alanb, dholmes, anthony, ohrstrom, ksrini, jrose, weijun, smarks
2012-03-06 20:27:12 +00:00
Alan Bateman
597f277dca 7113349: Initial changeset for Macosx port to jdk
Co-authored-by: Alexander Potochkin <alexander.potochkin@oracle.com>
Co-authored-by: Alexander Zuev <alexander.zuev@oracle.com>
Co-authored-by: Andrew Brygin <andrew.brygin@oracle.com>
Co-authored-by: Artem Ananiev <artem.ananiev@oracle.com>
Co-authored-by: Alex Strange <astrange@apple.com>
Co-authored-by: Bino George <bino@apple.com>
Co-authored-by: Christine Lu <christine.lu@oracle.com>
Co-authored-by: David Katleman <david.katleman@oracle.com>
Co-authored-by: David Durrence <david_durrence@apple.com>
Co-authored-by: Dmitry Cherepanov <dmitry.cherepanov@oracle.com>
Co-authored-by: Greg Lewis <glewis@eyesbeyond.com>
Co-authored-by: Kevin Miller <kevin_m_miller@apple.com>
Co-authored-by: Kurt Miller <kurt@intricatesoftware.com>
Co-authored-by: Landon Fuller <landonf@plausiblelabs.com>
Co-authored-by: Leonid Romanov <leonid.romanov@oracle.com>
Co-authored-by: Loefty Walkowiak <loefty@apple.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Naoto Sato <naoto.sato@oracle.com>
Co-authored-by: Philip Race <philip.race@oracle.com>
Co-authored-by: Roger Hoover <rhoover@apple.com>
Co-authored-by: Scott Kovatch <scott.kovatch@oracle.com>
Co-authored-by: Sergey ByloKhov <sergey.bylokhov@oracle.com>
Co-authored-by: Mike Swingler <swingler@apple.com>
Co-authored-by: Tomas Hurka <tomas.hurka@oracle.com>
Reviewed-by: jjh, alanb, dholmes, anthony, ohrstrom, ksrini, jrose, weijun, smarks
2012-03-06 20:26:03 +00:00
Alan Bateman
4b62ceec81 7113349: Initial changeset for Macosx port to jdk
Co-authored-by: Alexander Potochkin <alexander.potochkin@oracle.com>
Co-authored-by: Alexander Zuev <alexander.zuev@oracle.com>
Co-authored-by: Andrew Brygin <andrew.brygin@oracle.com>
Co-authored-by: Artem Ananiev <artem.ananiev@oracle.com>
Co-authored-by: Alex Strange <astrange@apple.com>
Co-authored-by: Bino George <bino@apple.com>
Co-authored-by: Christine Lu <christine.lu@oracle.com>
Co-authored-by: David Katleman <david.katleman@oracle.com>
Co-authored-by: David Durrence <david_durrence@apple.com>
Co-authored-by: Dmitry Cherepanov <dmitry.cherepanov@oracle.com>
Co-authored-by: Greg Lewis <glewis@eyesbeyond.com>
Co-authored-by: Kevin Miller <kevin_m_miller@apple.com>
Co-authored-by: Kurt Miller <kurt@intricatesoftware.com>
Co-authored-by: Landon Fuller <landonf@plausiblelabs.com>
Co-authored-by: Leonid Romanov <leonid.romanov@oracle.com>
Co-authored-by: Loefty Walkowiak <loefty@apple.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Naoto Sato <naoto.sato@oracle.com>
Co-authored-by: Philip Race <philip.race@oracle.com>
Co-authored-by: Roger Hoover <rhoover@apple.com>
Co-authored-by: Scott Kovatch <scott.kovatch@oracle.com>
Co-authored-by: Sergey ByloKhov <sergey.bylokhov@oracle.com>
Co-authored-by: Mike Swingler <swingler@apple.com>
Co-authored-by: Tomas Hurka <tomas.hurka@oracle.com>
Reviewed-by: jjh, alanb, dholmes, anthony, ohrstrom, ksrini, jrose, weijun, smarks
2012-03-06 20:25:43 +00:00
Alan Bateman
ec8aa63648 7113349: Initial changeset for Macosx port to jdk
Co-authored-by: Alexander Potochkin <alexander.potochkin@oracle.com>
Co-authored-by: Alexander Zuev <alexander.zuev@oracle.com>
Co-authored-by: Andrew Brygin <andrew.brygin@oracle.com>
Co-authored-by: Artem Ananiev <artem.ananiev@oracle.com>
Co-authored-by: Alex Strange <astrange@apple.com>
Co-authored-by: Bino George <bino@apple.com>
Co-authored-by: Christine Lu <christine.lu@oracle.com>
Co-authored-by: David Katleman <david.katleman@oracle.com>
Co-authored-by: David Durrence <david_durrence@apple.com>
Co-authored-by: Dmitry Cherepanov <dmitry.cherepanov@oracle.com>
Co-authored-by: Greg Lewis <glewis@eyesbeyond.com>
Co-authored-by: Kevin Miller <kevin_m_miller@apple.com>
Co-authored-by: Kurt Miller <kurt@intricatesoftware.com>
Co-authored-by: Landon Fuller <landonf@plausiblelabs.com>
Co-authored-by: Leonid Romanov <leonid.romanov@oracle.com>
Co-authored-by: Loefty Walkowiak <loefty@apple.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Naoto Sato <naoto.sato@oracle.com>
Co-authored-by: Philip Race <philip.race@oracle.com>
Co-authored-by: Roger Hoover <rhoover@apple.com>
Co-authored-by: Scott Kovatch <scott.kovatch@oracle.com>
Co-authored-by: Sergey ByloKhov <sergey.bylokhov@oracle.com>
Co-authored-by: Mike Swingler <swingler@apple.com>
Co-authored-by: Tomas Hurka <tomas.hurka@oracle.com>
Reviewed-by: jjh, alanb, dholmes, anthony, ohrstrom, ksrini, jrose, weijun, smarks
2012-03-06 20:25:18 +00:00
Maurizio Cimadamore
271ed603e1 7148556: Implementing a generic interface causes a public clone() to become inaccessible
Implementation of Resolve.isOverriddenIn() should distinguish between classes/interfaces

Reviewed-by: jjg
2012-03-06 16:50:32 +00:00
Maurizio Cimadamore
6acf436edc 7151070: NullPointerException in Resolve.isAccessible
Spurious accessibility check in TransTypes

Reviewed-by: jjg
2012-03-06 16:48:29 +00:00
Maurizio Cimadamore
954444af1c 7133238: Merge proto-kind and proto-type into a single result class
Restructure attribution code so that the check-logic can be encapsulated into a single class

Reviewed-by: jjg, dlsmith
2012-03-06 13:29:45 +00:00
Maurizio Cimadamore
d5036d16cd 7144506: Attr.checkMethod should be called after inference variables have been fixed
Unify post-inference sanity check with Attr.checkMethod

Reviewed-by: jjg, dlsmith
2012-03-06 13:28:05 +00:00
Maurizio Cimadamore
21312c5617 7148622: Some diagnostic methods do not go through Log.report
Deferred lint diagnostics ignore Log settings such as deferred diagnostics

Reviewed-by: jjg
2012-03-06 13:26:36 +00:00
Rickard Bäckman
cf406f37e3 7160570: Intrinsification support for tracing framework
Reviewed-by: sla, never
2012-03-06 12:36:59 +01:00
Daniel D. Daugherty
70685b85af Merge 2012-04-15 15:37:20 -07:00
Coleen Phillimore
b1550c24b9 Merge 2012-04-13 08:11:36 -07:00
Coleen Phillimore
7359b90813 7160467: Fix test for 7158988
Ended up checking in FieldMonitor.java as TestPostFieldModification.java

Reviewed-by: kamg
2012-04-12 22:03:05 -04:00
Dean Long
0e7ca534eb Merge 2012-04-12 18:41:24 -04:00
Rickard Bäckman
2ea955a642 7160924: jvmti: GetPhase returns incorrect phase before VMInit event is issued
Reviewed-by: acorn, dcubed
2012-04-12 13:24:08 +02:00