82485 Commits

Author SHA1 Message Date
Keith McGuigan
eae0998268 Merge 2011-01-12 15:27:43 -08:00
Coleen Phillimore
8d210c170e 7009828: Fix for 6938627 breaks visualvm monitoring when -Djava.io.tmpdir is defined
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
2011-01-12 13:59:18 -08:00
Stuart Marks
07549260db 7008713: diamond conversion of kerberos5 and security tools
Reviewed-by: weijun
2011-01-12 13:52:09 -08:00
Antonios Printezis
bc1df68513 6994297: G1: do first-level slow-path allocations with a CAS
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
2011-01-12 16:34:25 -05:00
Antonios Printezis
5f21cb1b9b 7007068: G1: refine the BOT during evac failure handling
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
2011-01-12 13:06:00 -05:00
Keith McGuigan
8867f6b298 6436034: Instance filter doesn't filter event if it occurs in native method
Use 'GetLocalInstance' JVMTI extension if it exists

Reviewed-by: coleenp, dcubed
2011-01-12 11:47:35 -05:00
Kevin Walls
b6d2068ee2 6994753: Implement optional hook to a Java method at VM startup
Reviewed-by: mchung, acorn
2011-01-12 15:44:16 +00:00
Michael McMahon
058b35d369 6829919: URLClassLoader.close() doesn't close resource file if getResourceAsStream(...) was called before
Reviewed-by: chegar
2011-01-12 15:05:10 +00:00
Doug Lea
677a39996a 7005424: Resync java.util.concurrent classes with Dougs CVS - Jan 2011
Reviewed-by: dholmes, chegar, mduigou
2011-01-12 14:40:36 +00:00
Vladimir Kozlov
4912ef0e5d 7011386: race in objArrayKlass::array_klass_impl
Move _lower_dimension field initialization before _higher_dimension and add storestore barrier.

Reviewed-by: dholmes, iveresov, never
2011-01-11 20:26:13 -08:00
Paul Hohensee
0b5708a12d Merge 2011-01-11 17:50:26 -05:00
Paul Hohensee
6931aa0a24 7011463: Sparc MacroAssembler::incr_allocated_bytes() needs a RegisterOrConstant argument
Replaced incr_allocated_bytes() formals var_size_in_bytes and con_size_in_bytes with a single RegisterOrConstant formal.

Reviewed-by: twisti, jcoomes
2011-01-11 17:33:21 -05:00
Stuart Marks
259f06de38 7011095: revert diamond changes from 6880112 that occur in method args
Reviewed-by: darcy, alanb
2011-01-11 13:42:34 -08:00
Lance Andersen
10467906c4 7000693: java.sql.Timestamp compareTo() issues using low values
Reviewed-by: okutsu
2011-01-11 12:36:43 -05:00
Jonathan Gibbons
12f8b2493e 6993305: starting position of a method without modifiers and with type parameters is incorrect
Reviewed-by: mcimadamore
2011-01-11 08:05:28 -08:00
Keith McGuigan
6308eab4d5 6814943: getcpool001 catches more than one JvmtiThreadState problem
Mark field volatile, use membars, and change access order to close race

Reviewed-by: dcubed, dholmes
2011-01-11 10:06:00 -05:00
Pavel Porvatov
30e2ffcf77 6589952: Swing: dead links in API documentation
Reviewed-by: alexp
2011-01-11 12:51:33 +03:00
Kelly O'Hair
dfecf0dd97 Merge 2011-01-10 22:26:47 -08:00
Igor Veresov
6a80d2126c 4930919: race condition in MDO creation at back branch locations
Reuse set_method_data_for_bcp() to setup mdp after MDO creation.

Reviewed-by: kvn, never
2011-01-10 18:46:29 -08:00
Kelly O'Hair
d0cebf1350 6989472: Provide simple jdk identification information in the install image
Reviewed-by: alanb
2011-01-10 18:07:58 -08:00
Kelly O'Hair
da42f22c48 Merge 2011-01-10 17:53:01 -08:00
Stuart Marks
571f84fa86 7005608: diamond conversion of JCA and crypto providers
Reviewed-by: wetmore
2011-01-10 17:06:10 -08:00
Kelly O'Hair
fc42d65040 7011382: Fix use of VS100COMNTOOLS when installed in non-default or non-space path
Reviewed-by: prr
2011-01-10 17:00:05 -08:00
Jonathan Gibbons
e2ed68fb2f 6396503: javac should not require assertions enabled
Reviewed-by: mcimadamore
2011-01-10 15:08:31 -08:00
Jonathan Gibbons
43e78a8d44 6992999: fully remove JSR 308 from langtools
Reviewed-by: mcimadamore
2011-01-10 14:57:59 -08:00
Keith McGuigan
ae65c6240f 6458402: 3 jvmti tests fail with CMS and +ExplicitGCInvokesConcurrent
Make JvmtiGCMark safe to run non-safepoint and instrument CMS

Reviewed-by: ysr, dcubed
2011-01-10 17:14:53 -05:00
Lance Andersen
a137c29891 6544224: Remove the need of sun.reflect.misc
Reviewed-by: alanb
2011-01-10 14:43:50 -05:00
Qi Zuo
fcd8f43ac7 Merge 2011-01-10 13:45:33 -05:00
Chris Hegarty
ed5bd3c06d 6997851: Create NTLM AuthenticationCallBack class to avoid NTLM info leakage on client side
Reviewed-by: michaelm
2011-01-10 18:12:43 +00:00
Kelly O'Hair
c8a886ffbe Merge 2011-01-10 10:00:05 -08:00
Kelly O'Hair
b5f40849ac Merge 2011-01-10 09:59:16 -08:00
Daniel D. Daugherty
6215ab50b3 Merge 2011-01-10 09:23:20 -08:00
Christian Thalinger
595eda12a4 7010913: JSR 292 ciMethodHandle does not handle MethodHandleCompiler exceptions properly
Reviewed-by: kvn, never
2011-01-10 03:58:07 -08:00
Alan Bateman
a449cd08d7 7002957: (fc) FileChannel.transferTo fails to load libsendfile on Solaris 64-bit
Reviewed-by: chegar
2011-01-10 09:32:32 +00:00
Christian Thalinger
b2f607fcb6 7010180: JSR 292 InvokeDynamicPrintArgs fails with: assert(_adapter == NULL) failed: init'd to NULL
Reviewed-by: never
2011-01-10 00:56:39 -08:00
David Holmes
5d2936a29c 7010665: Misplaced membar in C1 implementation of Unsafe.get/putXXX
Modify membars to match regular volatile variable handling

Reviewed-by: iveresov, kvn, never
2011-01-09 17:16:16 -05:00
Erik Trimble
64115cbb85 Merge 2011-01-07 22:56:35 -08:00
Erik Trimble
f87965dc9e 7011125: Bump the HS20 build number to 06
Update the HS20 build number to 06

Reviewed-by: jcoomes
2011-01-07 22:42:10 -08:00
Kelly O'Hair
c5d2b222a9 6980024: Rebranding jre7/jdk7 License, Copyright, Readme
6912291: Third party license agreement should be present in all bundles

Reviewed-by: katleman
2011-01-07 21:52:35 -08:00
Erik Trimble
45d3cde924 Added tag hs20-b05 for changeset 5f31baaff55b 2011-01-07 19:09:02 -08:00
Daniel D. Daugherty
0c7a73dc8c Merge 2011-01-07 15:54:32 -08:00
Stuart Marks
b2ef93e7d4 7008728: diamond conversion of basic security, permissions, authentication
Reviewed-by: mullan
2011-01-07 15:39:58 -08:00
Daniel D. Daugherty
d73624f279 Merge 2011-01-07 13:59:48 -08:00
Chris Hegarty
c816ca10db 7009760: Possible stack corruption in Java_java_net_TwoStacksPlainSocketImpl_socketGetOption
SOCKET_ADDRESS -> SOCKETADDRESS

Reviewed-by: alanb
2011-01-07 21:02:58 +00:00
Bob Vandette
cd9895a49d Merge 2011-01-07 15:57:02 -05:00
Vladimir Kozlov
5bce844ff6 6876037: CTW fails jdk7/hotspot/src/share/vm/opto/type.cpp:2055. assert(bits,"Use TypePtr for NULL")
Add missing 0 value check in TypeRawPtr::add_offset().

Reviewed-by: never
2011-01-07 11:53:24 -08:00
Vladimir Kozlov
afbf71368c 7009756: volatile variables could be broken throw reflection API
Use Atomic::load() and Atomic::store() to access a volatile long.

Reviewed-by: iveresov, jrose, dholmes, never
2011-01-07 10:16:57 -08:00
Bob Vandette
c14e8eb4f2 7009268: guarantee(middle - slop > start) failed: need enough space to divide up
Codebuffer can overflow on test with large number of calls

Reviewed-by: dholmes, collins
2011-01-07 12:44:54 -05:00
Alan Bateman
bbeb1fa936 Merge 2011-01-07 15:51:26 +00:00
Alan Bateman
5182f947a2 6993732: Remove the HPI
Reviewed-by: ohair, lancea, chegar, mduigou, mchung, mr
2011-01-07 15:49:44 +00:00