7030150: Type inference for generic instance creation failed for formal type parameter Summary: Problem when explicit generic constructor type-arguments are used in conjunction with diamond Reviewed-by: jjg

7030606: Project-coin: multi-catch types should be pairwise disjoint Summary: Bring javac in sync with latest Project Coin EDR Reviewed-by: jjg

7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class Summary: Diamond accepts non-parameterized member inner classes with parameterized outer because of a bad check Reviewed-by: jjg

7001086: NLS: un-used resources should be removed from standard.properties and improper concatenation Reviewed-by: jjg

6437138: JSR 199: Compiler doesn't diagnose crash in user code 6482554: uncaught exception from annotation processor not reported through JavaCompiler.CompilationTask.call Reviewed-by: mcimadamore

7009599: javac build puts extraneous files into dist/lib/classes.jar Reviewed-by: ohair

6597678: JavaCompiler.getStandardFileManager always uses default charset not the one that user specifies Reviewed-by: mcimadamore

7010342: End tag for element P is not open for few html files generated using new javadoc Reviewed-by: jjg

7025314: NLS: translatability violation on standard.properties Reviewed-by: jjg

Added tag jdk7-b137 for changeset ec825a21d1f8

Merge

Merge

7033660: Update copyright year to 2011 on any files changed in 2011 Reviewed-by: dholmes

Added tag jdk7-b137 for changeset e7ad21289bd4

Merge