Merge

Merge

6732461: broken message file for annotation processing Summary: Regression in sqe test introduced in 6720185 Reviewed-by: jjg

6734819: Javac performs flows analysis on already translated classes Summary: Regression in JavaCompiler.desugar introduced in 6726015 Reviewed-by: jjg

6676362: Spurious forward reference error with final var + instance variable initializer Summary: Some javac forward reference errors aren't compliant with the JLS Reviewed-by: jjg

6718364: inference fails when a generic method is invoked with raw arguments Summary: Bug in the implementation of Types.isSubtypeUnchecked Reviewed-by: jjg

6695838: javac does not detect cyclic inheritance involving static inner classes after import clause Summary: Javac fails to detect some errors due to the order in which a class' static imports are entered Reviewed-by: jjg

Merge

6733995: legal notice repair on langtools/src/share/classes/com/sun/tools/javap/JavapTask.java Reviewed-by: ksrini

6730423: Diagnostic formatter should be an instance field of JCDiagnostic Summary: JCDiagnostic.fragment should be deprecated and the diagnostic factory should be used instead Reviewed-by: jjg

4884240: additional option required for javap Reviewed-by: ksrini

4111861: static final field contents are not displayed Reviewed-by: ksrini

6627362: javac generates code that uses array.clone, which is not available on JavaCard 6627364: javac needs Float and Double on the bootclasspath even when not directly used 6627366: javac needs Cloneable and Serializable on the classpath even when not directly used Reviewed-by: darcy

Added tag jdk7-b33 for changeset e1305f648e12

Merge

Added tag jdk7-b33 for changeset 31ff14943017

Merge

Added tag jdk7-b33 for changeset f0165b195228

Merge

Merge

Merge

Added tag jdk7-b33 for changeset d958f883b42a

Merge

Merge

6614210: JPRT Windows 32bit msival2 build failure when building 'install' workspace Summary: suppresses wscript's modal dialog on error and no msi validation for jprt. Reviewed-by: ohair, jmelvin

Merge

6674227: Missing LICENSE file during build Summary: Just a JPRT usage issue. The top level files (like LICENSE) are needed to create the jdk image (j2sdk-image directory). Reviewed-by: tbell

Merge

Merge

6610174: Improve CompositeDataSupport.toString when it includes arrays Reviewed-by: dfuchs

Merge

6334663: TabularDataSupport should be able to return values in the insertion order Reviewed-by: dfuchs

6733294: MBeans tab - UI issues with writable attributes Reviewed-by: emcmanus

Merge

6717257: MBeanServer doesn't describe RuntimeException for methods inherited from MBeanServerConnection Reviewed-by: dfuchs

6730507: java.util.Timer schedule delay Long.MAX_VALUE causes task to execute multiple times Reviewed-by: chegar

Merge

6732441: TEST_BUG: ThreadMXBeanProxy test fails intermittently. Summary: Fixed the race condition in the test. Reviewed-by: jjh

6734273: Minor updates to documentation of Custom MXBean Mappings Reviewed-by: dfuchs

6733589: Intermittent failure of test/javax/management/eventService/SharingThreadTest.java Reviewed-by: sjiang

6730273: TEST: JDI_REGRESSION test Solaris32AndSolaris64Test.sh fails if -XX:+UseCompressedOops is used Summary: Fix test to not pass -XX:[+-]UseCompressedOops to the debuggee. Reviewed-by: tbell

6732192: CORE_PKGS.gmk: need to declare javax.management.event in the CORE_PKGS variable Reviewed-by: emcmanus

6725789: ScheduledExecutorService does not work as expected in jdk7/6/5 Reviewed-by: martin, dholmes, chegar

6730380: java.util.Timer should use AtomicInteger Reviewed-by: dl, chegar

6616825: JMX query returns no value in 1.0 compatibility mode - deserialization bug in readObject() Reviewed-by: emcmanus

5108776: Add reliable event handling to the JMX API 6218920: API bug - impossible to delete last MBeanServerForwarder on a connector Reviewed-by: emcmanus

6689505: Improve MBeanServerNotification.toString Reviewed-by: emcmanus

6730926: Document that create/registerMBean can throw RuntimeMBeanException from postRegister Reviewed-by: emcmanus