6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive Reviewed-by: darcy

6724551: Use Queues instead of Lists to link compiler phases Reviewed-by: darcy

6724327: eliminate use of shell tests for simple golden file tests Reviewed-by: darcy

4501661: disallow mixing -public, -private, and -protected options at the same time Reviewed-by: ksrini

6716452: (classfile) need a method to get the index of an attribute Reviewed-by: ksrini

6715753: unknown option error can be a little more helpful Reviewed-by: ksrini

6715757: javap does not print "extends java.lang.Object" Reviewed-by: ksrini

6715251: javap should be consistent with javac and return 2 if given no arguments Reviewed-by: ksrini

Added tag jdk7-b31 for changeset bcb5c0d7c1ab

Merge

Added tag jdk7-b31 for changeset 3e8ca32a629a

Merge

Added tag jdk7-b31 for changeset 2378316adee0

Merge

Added tag jdk7-b31 for changeset 918ff19c1a3a

Merge

6727683: Cleanup use of COMPILER_WARNINGS_FATAL in makefiles Reviewed-by: tbell

Merge

6548261: Use of SE in make/common/Defs-windows.gmk Reviewed-by: darcy

Merge

6405995: (ch) test/java/nio/channels/Selector/Wakeup.java broken Summary: Moved the unit test case back to open repo, it works after bugfixes in jdk6 Reviewed-by: alanb

Merge

6429289: (se) sun.nio.ch.SelectorImpl.processDeregisterQueue creates excessive garbage Summary: Check if the cancelledKeys is empty or not before creating iterator Reviewed-by: alanb

6541641: (fc) java/nio/channels/FileChannel/ExpandingMap.java should clean up after itself Summary: Close channel and explicitly de-ref the mapped buffers before exit. Reviewed-by: alanb

6608833: (se spec) SelectionKey @throws references wrong param Summary: Update the API doc to correct the wrong description Reviewed-by: alanb

Merge

Merge

6725192: Some JDI Regression tests fail if @debuggeeVMOptions contain multiple blanks Summary: Fix to allow mutiple blanks between options Reviewed-by: tbell