4486841: UTF-8 decoder should adhere to corrigendum to Unicode 3.0.1 6636317: Optimize UTF-8 coder for ASCII input Summary: re-write the UTF-8 charset to obey the standard and improve the performance Reviewed-by: alanb

6732421: Removed old javavm and Classic VM files from the jdk7 sources Reviewed-by: alanb

6653883: jmap with no option should print mmap instead of heap information. Summary: Changed the default option of jmap to print mmap. Reviewed-by: jjh

6739302: Check that deserialization preserves EnumSet integrity Reviewed-by: dl, chegar Contributed-by: jjb@google.com

Merge

Merge

6736461: ThreadMXBean Locks.java fails intermittently. Summary: Fixed the test to wait for the right state before calling check thread information. Reviewed-by: jjh

6705893: javax.script tests should not require a js engine on OpenJDK Summary: Fixed the tests to pass with open JDK. Reviewed-by: darcy

Merge

6496269: Many warnings generated from com/sun/java/util/jar/pack/*.cpp when compiled on Linux Summary: Removal of compiler warnings and fixing of assert logic. Reviewed-by: jrose, ksrini, bristor

6737900: TEST: Some JDI regression tests timeout on slow machines Summary: Don't execute useless code, and split test into multiple @runs. Reviewed-by: tbell

Added tag jdk7-b34 for changeset 8810ae8edcd1

Merge

Merge

6745064: Update Hotspot build number for HS14 Summary: Bump build number for hs14-b04 Reviewed-by: jcoomes