8011602: jobjc build failure on Mac Summary: Remove @Native annotation from macosx/native/jobjc/src/core/java/com/apple/jobjc/Coder.java Reviewed-by: mchung, dholmes

Merge

5001942: Missings SOCKS support for direct connections Summary: Add support for socksNonProxyHosts Reviewed-by: chegar, khazra Contributed-by: Christos Zoulas <christos@zoulas.com>

8011380: FX dependency on PlatformLogger broken by 8010309 Reviewed-by: alanb

7155720: PKCS11 minor issues in native code Summary: Added OOM handling to address the two issues found by parfait. Reviewed-by: weijun

8000406: change files using @GenerateNativeHeader to use @Native Summary: Use @Native annotation to mark constants interested by native codes Reviewed-by: alanb, anthony, prr

7091601: Arabic Locale: can not set type of digit in application level Reviewed-by: okutsu

8011393: Typo in javadoc for SerialClob.truncate Reviewed-by: darcy

8011373: Property java.runtime.profile should be removed (left-over code) Reviewed-by: lancea, dholmes

8011234: Performance regression with ftp protocol when uploading in image mode Reviewed-by: chegar

8004979: java.lang.reflect.Modifier.toString should include "default" Reviewed-by: mduigou

Merge

8007379: Base64.getMimeDecoder().decode() throws IAE for a non-base64 character after padding 8008925: Base64.getMimeDecoder().decode() does not ignore padding chars Summary: updated implementation and spec for corner cases. Reviewed-by: alanb

8009558: linked_md.c::dll_build_name can get stuck in an infinite loop Reviewed-by: alanb, sspitsyn

8011199: Backout changeset JDK-7143928 (2b34a1eb3153) Reviewed-by: darcy, dholmes

8011187: Remove obsolete/unused targets from jdk/test/Makefile Reviewed-by: ohair

7143928: Optimize empty HashMap and ArrayList Reviewed-by: mduigou Contributed-by: Sergey Linetskiy <sergey.linetskiy@oracle.com>, John Rose <john.rose@oracle.com>, Mike Duigou <mike.duigou@oracle.com>

8010268: Remove dependence upon clean target from jdk/test/Makefile prep target Reviewed-by: tbell, mchung

8010309: Improve PlatformLogger.isLoggable performance by direct mapping from an integer to Level Reviewed-by: mchung Contributed-by: peter.levart@gmail.com, bourges.laurent@gmail.com

8010125: keytool -importkeystore could create a pkcs12 keystore with different storepass and keypass Reviewed-by: vinnie

8010991: Enable test/javax/script/GetInterfaceTest.java again Reviewed-by: lagergren, hannesw

8010846: Update the corresponding test in test/vm/verifier/TestStaticIF.java Summary: Remove test flag -XX:-UseSplitVerifier, not supported classfile 52 Reviewed-by: acorn, hseigel

7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations Reviewed-by: mduigou, jfranck

8010837: FileInputStream.available() throw IOException when encountering negative available values Summary: Remove the check in the native code to allow negative values Reviewed-by: mchung

8009427: Re-enable tests that were disable to ease complicated push Reviewed-by: sla, mchung, dcubed Contributed-by: Erik Helin <erik.helin@oracle.com>

8010316: Improve handling of char sequences containing surrogates Summary: Fix and optimize codePointAt, codePointBefore and similar methods Reviewed-by: sherman, okutsu, ulfzibis, kizune

8007905: To add a system property to create zip file without using ZIP64 end table when entry count > 64k Summary: Provide a system property to inhibit ZIP64 mode for >64k entries Reviewed-by: alanb, sherman

Merge

7153702: [TEST_BUG] [macosx] Synchronization problem in test javax/swing/JPopupMenu/6827786/bug6827786.java Reviewed-by: serb, alexsch

8006941: [macosx] Deadlock in drag and drop 7199783: Setting cursor on DragSourceContext does not work on OSX Reviewed-by: anthony, serb

8010925: COPY AND PASTE TO AND FROM SIGNED APPLET FAILS AFTER FIRST INTERNAL COPY PRFRMD Reviewed-by: anthony, serb

8011123: serialVersionUID of java.awt.dnd.InvalidDnDOperationException changed in JDK8-b82 Reviewed-by: anthony, serb