Merge

6930108: IllegalArgumentException in AbstractDiagnosticFormatter for tools/javac/api/TestJavacTaskScanner.jav Reviewed-by: darcy

Merge

6931126: jtreg tests not Windows friendly Reviewed-by: darcy

6931927: position issues with synthesized anonymous class Reviewed-by: darcy

6449781: TypeElement.getQualifiedName for anonymous classes returns null instead of an empty name Reviewed-by: jjg

6931127: strange test class files Reviewed-by: darcy

6931482: minor findbugs fixes Reviewed-by: darcy

6931130: Remove unused AnnotationCollector code from JavacProcessingEnvironment Reviewed-by: jjg

6930032: fix findbugs errors in com.sun.tools.javac.comp Reviewed-by: darcy

6930076: "null" can incorrectly appear in error message compiler.err.error.reading.file Reviewed-by: darcy

6881645: Unchecked method call on a method declared inside anonymous inner causes javac to crash Reviewed-by: mcimadamore

6893943: exit code from javah with no args is 0 Reviewed-by: darcy

6929544: langtools source code uses statics qualified by instance variables Reviewed-by: darcy

6929645: Address various findbugs warnings in langtools Reviewed-by: jjg

4880220: Add a warning when accessing a static method via an reference Reviewed-by: darcy

6511613: javac unexpectedly doesn't fail in some cases if an annotation processor specified Reviewed-by: darcy

Added tag jdk7-b85 for changeset 6830a7ec21d0

Merge

Added tag jdk7-b85 for changeset 58d57db8348f

Merge

Added tag jdk7-b85 for changeset cdc37d7f9bba

Merge

Added tag jdk7-b85 for changeset 3e4b803f1d22

Merge

Merge

6915983: testing problems, adjusting list of tests, needs some investigation Reviewed-by: alanb

Merge

6880321: sun.security.provider.JavaKeyStore abuse of OOM Exception handling Reviewed-by: xuelei

6923681: Jarsigner crashes during timestamping Reviewed-by: vinnie

6844909: support allow_weak_crypto in krb5.conf Reviewed-by: valeriep

6931763: sanity checks broken with latest cygwin, newer egrep -i option problems Reviewed-by: jjg

6931216: TEST_BUG: test/java/nio/file/WatchService/LotsOfEvents.java failed with NPE Reviewed-by: chegar

Merge

6921001: api/java_security/IdentityScope/IdentityScopeTests.html#getSystemScope fails starting from b78 JDK7 Reviewed-by: mullan

6921374: java.lang.String::hashCode() should check for count == 0 to avoid repeated stores hash = 0 Reviewed-by: darcy, ohair

6815768: File.getxxxSpace() methods fail for very large file systems under 32bit Java Reviewed-by: ohair

6929259: Remove double spaces from Dual-pivot quicksort Reviewed-by: alanb Contributed-by: vladimir.yaroslavskiy@sun.com

6929532: (file) WatchService should avoid queuing new modify events when lots of files are changing Reviewed-by: alanb Contributed-by: sebastian.sickelmann@gmx.de

6916202: More cases of invalid ldap filters accepted and processed Reviewed-by: vinnie, weijun

6929382: Various core classes in util and elsewhere are missing @param <T> tags Reviewed-by: dholmes, martin

6926800: TEST_BUG: java/nio/file/Files/walk_file_tree.sh fails with newer versions of find(1) Reviewed-by: forax

6928960: make modules fails to build class analyzer Reviewed-by: mchung

6925932: (file) Path.endsWith can throw ArrayIndexOutOfBoundsException (unx) Reviewed-by: chegar

6925977: (file) test/java/nio/file/Path/CheckPermissions.java fails if test.src on read-only file system Reviewed-by: chegar

Merge

Merge

Merge

6921644: XMLEncoder generates invalid XML Reviewed-by: peterz

6917744: JScrollPane Page Up/Down keys do not handle correctly html tables with different cells contents Reviewed-by: peterz, alexp

6913768: With default SynthLookAndFeel instance installed new JTable creation leads to throwing NPE Reviewed-by: peterz

6924059: SynthScrollBarUI.configureScrollBarColors() should have spec different from the overridden method Reviewed-by: peterz

6929298: The SynthSliderUI#calculateTickRect method should be removed Reviewed-by: peterz

6923305: SynthSliderUI paints the slider track when the slider's "paintTrack" property is set to false Reviewed-by: alexp

6918861: SynthSliderUI.uninstallDefaults() is not called when UI is uninstalled Reviewed-by: malenkov

6918447: SynthToolBarUI.setBorderToXXXX() methods don't correspond inherited spec. They do nothing. Reviewed-by: peterz

6913758: Specification for SynthViewportUI.paintBorder(...) should mention that this method is never called Reviewed-by: peterz

4498236: RFE: Provide a toString method for PropertyChangeEvent and other classes Reviewed-by: peterz

6921289: (tz) Support tzdata2010b Reviewed-by: okutsu

6909002: Remove indicim.jar and thaiim.jar from JRE and move to samples if needed Reviewed-by: okutsu

6848475: JSlider does not display the correct value of its BoundedRangeModel Reviewed-by: peterz

Merge

6918065: Crash in Java2D blit loop (IntArgbToIntArgbPreSrcOverMaskBlit) in 64bit mode Reviewed-by: igor, bae

6892485: Deadlock in SunGraphicsEnvironment / FontManager Summary: Synchronize on correct monitor in SunFontManager. Reviewed-by: igor, prr