6837293: Reapply fix for 6588003 to JDK7 Reviewed-by: alexp

Merge

6777487: Encoder allows reading private variables with certain names Reviewed-by: peterz

6660539: Introspector shares cache of mutable BeanInfo between AppContexts. Reviewed-by: peterz

6826801: JarFileFactory should not use HashMap<URL> Summary: Replace URL with a String representation. Reviewed-by: michaelm, jccollet

6826780: URLClassPath should use HashMap<String, XXX> instead of HashMap<URL, XXX> Summary: Replace URL with a String representation. Reviewed-by: michaelm, jccollet

Merge

6838598: Legal notice repair: jdk/src/share/classes/sun/dyn/FilterGeneric.java Reviewed-by: xdono

6867657: Many JSN tests do not run under cygwin Reviewed-by: ohair

6868533: 3/4 JDI: remove '-source 1.5' and '-target 1.5' options from com.sun.jdi tests Summary: We are long past needing to make sure these tests can build on Tiger/JDK1.5.0. Reviewed-by: tbell

6856590: (process) Use RESTARTABLE in UNIXProcess_md.c Summary: Wrap all system calls with RESTARTABLE Reviewed-by: michaelm

6868160: (process) Use vfork, not fork, on Linux to avoid swap exhaustion Summary: Boldly go where no jdk has dared go before Reviewed-by: michaelm

4116222: Errors in Arabic code-conversion tables, part II Summary: updated the IBM420 datatable Reviewed-by: alanb

Merge

6867687: keytool's standard.sh test timeout sometimes Reviewed-by: xuelei

Merge

Merge

6867244: Tests missing @run tag Reviewed-by: sherman

6867101: Path.checkAccess fails with sharing violation on special files such as pagefile.sys Reviewed-by: sherman

6867231: Regression: jdk/test/sun/security/krb5/ConfPlusProp.java error against jdk7/pit/b68 Reviewed-by: xuelei

6866719: Rename execvpe to avoid symbol clash with glibc 2.10 Reviewed-by: darcy

6804124: Replace "modified mergesort" in java.util.Arrays.sort with timsort Summary: Easy port of timsort from android Reviewed-by: martin

6866554: Misc. javadoc warnings Reviewed-by: alanb

Merge

Merge

5063507: (fmt) missing exception for "%#s" format specifier Summary: throw appropriate exception when necessary Reviewed-by: alanb

6805775: LinkedBlockingQueue Nodes should unlink themselves before becoming garbage 6815766: LinkedBlockingQueue's iterator can return null if drainTo(c) executes concurrently Summary: Faster, more correct. Use self-linking trick to avoid gc retention Reviewed-by: martin, dholmes

6785442: ConcurrentLinkedQueue.remove() and poll() can both remove the same element 6493942: ConcurrentLinkedQueue.remove sometimes very slow Summary: new algorithm for handling concurrent linked lists Reviewed-by: martin

Added tag jdk7-b69 for changeset e0b23259a484

Merge

Merge

Merge