78946 Commits

Author SHA1 Message Date
Lana Steuck
b362a78fef Merge 2010-09-26 14:14:48 -07:00
Lana Steuck
78db31beb6 Merge 2010-09-25 12:02:32 -07:00
Lana Steuck
53e6cf8989 Merge 2010-09-25 12:00:05 -07:00
Lana Steuck
718a6bf6c2 Merge 2010-09-25 10:38:50 -07:00
Sunita Koppar
d7169cc13e 6891766: Vulnerabilities in use of reflection in CORBA
Reviewed-by: hawtin
2010-09-24 22:42:14 -07:00
Weijun Wang
b32aa9d2d5 6986868: TEST failure: sun/security/tools/jarsigner/crl.sh
Reviewed-by: ohair
2010-09-25 10:21:30 +08:00
Lana Steuck
98b2aad842 Merge 2010-09-24 16:43:08 -07:00
Lana Steuck
6b9e679958 Merge 2010-09-24 16:41:32 -07:00
Lana Steuck
e9c4f04da5 Merge 2010-09-24 16:38:09 -07:00
Lana Steuck
a6714f583f Merge 2010-09-24 16:38:08 -07:00
Lana Steuck
d0ae7f5633 Merge 2010-09-24 16:38:05 -07:00
Lana Steuck
1baf4d94fb Merge 2010-09-24 16:38:02 -07:00
Kelly O'Hair
f181e2fb8f 6987114: Fix top level "test" Makefile logic, add jdk/make/Makefile test target
6987113: Remove SCCS logic from makefiles

Reviewed-by: mchung
2010-09-24 14:22:01 -07:00
Kelly O'Hair
0294919402 6987117: Add jprt test sets
Reviewed-by: mchung
2010-09-24 14:06:57 -07:00
Kelly O'Hair
4e0aea2b65 6987117: Add jprt test sets
Reviewed-by: mchung
2010-09-24 14:04:01 -07:00
Kelly O'Hair
e0c099ccb2 6987114: Fix top level "test" Makefile logic, add jdk/make/Makefile test target
Reviewed-by: mchung
2010-09-24 14:03:33 -07:00
Roland Westrelin
718b005834 Merge 2010-09-24 13:14:32 -07:00
Christian Thalinger
79847991ad 6986944: JSR 292 assert(caller_nm->is_method_handle_return(caller_frame.pc())) failed: must be MH call site
Reviewed-by: never, kvn
2010-09-24 03:51:43 -07:00
Erik Trimble
b7d1b4674b 6987149: Fix incorrect Oracle copyright header in make/templates files
Minor fix to first line of template copyright files

Reviewed-by: ohair
2010-09-24 00:52:04 -07:00
Erik Trimble
03f9d08651 Merge 2010-09-24 00:51:15 -07:00
Yoshito Umaoka
84ca32b8df 6986612: pit jdk7 b112: java.util.Locale getDisplayVariant() sqe test getDisplayVariantTests.java fails
Reviewed-by: dougfelt
2010-09-23 20:05:20 -07:00
Christine Lu
90841ef428 Added tag jdk7-b111 for changeset 4ad83e49760f 2010-09-23 17:33:52 -07:00
Christine Lu
311fc82f63 Added tag jdk7-b111 for changeset 6daafb1093c6 2010-09-23 17:33:40 -07:00
Christine Lu
59fbc51787 Added tag jdk7-b111 for changeset 492db456c4fa 2010-09-23 17:33:33 -07:00
Christine Lu
d7a72c75ba Added tag jdk7-b111 for changeset d32614f0702d 2010-09-23 17:33:33 -07:00
Christine Lu
fcc90d4983 Added tag jdk7-b111 for changeset a8fb6372bee7 2010-09-23 17:33:27 -07:00
Christine Lu
b640ef0cf0 Added tag jdk7-b111 for changeset eaf3ed79a7b5 2010-09-23 17:33:23 -07:00
Christine Lu
3ca0fc1853 Added tag jdk7-b111 for changeset fde8c74d7bd1 2010-09-23 17:33:18 -07:00
Michael McMahon
b03b79abd0 6986400: Change Cookie to Cookie2 in 6980004 fix
Fix error in previous fix for 6980004

Reviewed-by: chegar
2010-09-23 03:22:13 -07:00
Tom Rodriguez
bce771e0fe 6986028: assert(_base == Int) failed: Not an Int in CmpINode::sub
Reviewed-by: kvn, twisti
2010-09-22 23:51:03 -07:00
Mandy Chung
872a9b9303 6984036: servicetag vendor rebranding issues
Update product_vendor field to use java.vendor system property

Reviewed-by: ohair
2010-09-22 21:44:18 -07:00
Tom Rodriguez
16efe7ce5c 6972540: sun/nio/ch/SocketChannelImpl compilation crashed when executing CompileTheWorld
Reviewed-by: kvn
2010-09-22 21:10:46 -07:00
Weijun Wang
f788ac2dbd 6982971: TEST failure: com/sun/security/sasl/ntlm/NTLMTest.java
Reviewed-by: wetmore
2010-09-23 10:46:03 +08:00
Tom Rodriguez
f4b4eae617 6982537: Crash in Node*step_through_mergemem
Reviewed-by: kvn
2010-09-22 13:01:12 -07:00
Jonathan Gibbons
5e44010f8c 6986772: langtools netbeans build should use ${ant.core.lib} instead of ${ant.home}/lib/ant.jar
Reviewed-by: ohair
2010-09-22 12:53:26 -07:00
Kelly O'Hair
4b6857d9ba Merge 2010-09-22 12:53:06 -07:00
Kelly O'Hair
86803785e8 6946527: rebranding system properties per Oracle Requirements (vendor)
Changes from "Sun Microsystems, Inc." to "Oracle Corporation" in the java.vendor, java.specification.vendor and java.vendor.url Java system properties. Also change of Windows COMPANY file property from "Oracle" to "Oracle Corporation".

Reviewed-by: lancea, flar
2010-09-22 11:06:50 -07:00
Keith McGuigan
9e9551fdd8 Merge 2010-09-22 12:54:51 -04:00
Athijegannathan Sundararajan
28c94557eb 6587674: NoClassdefFound when anonymously extending a class
Reviewed-by: jjg, mcimadamore
2010-09-22 20:53:34 +05:30
Daniel D. Daugherty
c7a512e006 6949710: 3/3 the GC'able nature of Logging objects needs to be made brutally clear
Add words in more places to make it clear that Logger objects are GC'able unless there is a strong reference.

Reviewed-by: dholmes, andrew
2010-09-22 07:46:49 -07:00
Igor Veresov
0f31511718 6986270: guarantee(*bcp != Bytecodes::_monitorenter || exec_mode != Deoptimization::Unpack_exception) fails
Propagate the compiler type of the deopting method to vframeArrayElement::unpack_on_stack()

Reviewed-by: jrose, never
2010-09-21 13:38:35 -07:00
Doug Lea
9d5707e87d 6986050: Small clarifications and fixes for ForkJoin
Clarify FJ.get on throw InterruptedException, propagate ThreadFactory, shutdown transition

Reviewed-by: chegar
2010-09-21 16:06:59 +01:00
Chris Hegarty
0d636dcf1c 6672144: HttpURLConnection.getInputStream sends POST request after failed chunked
Reviewed-by: michaelm
2010-09-21 15:58:06 +01:00
Daniel D. Daugherty
08b41f30d8 6985848: 3/4 fix for 6561870 causes sa-jdi.jar to be rebuilt every time
Refine fix for 6561870 to only rebuild sa-jdi.jar when needed

Reviewed-by: never, ohair, coleenp
2010-09-21 06:58:44 -07:00
Peter Zhelezniakov
89def18fca 6978052: No appropriate CCC request for listed JDK 7 changes in javax.swing.plaf.synth package (b84)
Reviewed-by: malenkov
2010-09-21 10:04:41 +04:00
Peter Zhelezniakov
83a639538d 6960126: With GTK L&F JDesktopPane substitutes set desktop manager
Reviewed-by: malenkov
2010-09-21 10:03:53 +04:00
Doug Lea
94ffffd5cb 6981113: Add ConcurrentLinkedDeque
Extend techniques developed for ConcurrentLinkedQueue and LinkedTransferQueue to implement a non-blocking concurrent Deque with interior removes.

Reviewed-by: martin, dholmes, chegar
2010-09-20 18:05:09 -07:00
Keith McGuigan
bc7a44e595 6975210: java.lang.VerifyError in some of JCK tests
Naked oop in verificationType::is_reference_assignable_from()

Reviewed-by: never, kvn, coleenp
2010-09-20 15:38:04 -04:00
Maurizio Cimadamore
05fb73163c 6863465: javac doesn't detect circular subclass dependencies via qualified names
Class inheritance circularity check should look at trees, not just symbols

Reviewed-by: jjg
2010-09-18 14:24:09 -07:00
Maurizio Cimadamore
cd3371e702 5088624: cannot find symbol message should be more intelligent
Resolve.java should keep track of all candidates found during a method resolution sweep to generate more meaningful diagnostics

Reviewed-by: jjg
2010-09-18 09:56:23 -07:00