Merge

6908562: JFB Custom Revision Version Build/Makefile changes Reviewed-by: ohair, ksrini, katleman

7025412: make381 issues with quotes in jdk/make/docs/Makefile and other places Reviewed-by: mchung, herrick

7026228: Remove make/modules and make/common/Modules.gmk Reviewed-by: alanb, ohair

7025631: Remove the modules build support from jdk 7 Reviewed-by: alanb, ohair

Merge

Merge

7025468: Tests using diamond with anonymous inner classes needs to be reverted Reviewed-by: dholmes, forax

Merge

6994008: PKCS11 should support "RSA" and "RSA/ECB/NoPadding" ciphers Summary: Add support for RSA_X_509 mechanism and aliasing of "RSA" to "RSA/ECB/PKCS1Padding". Reviewed-by: wetmore

Merge

Merge

7022467: SecretKeyFactory doesn't support algorithm "AES" on Windows and Linux Reviewed-by: wetmore, valeriep

7025105: TEST_BUG test/com/sun/jndi/ldap/NoWaitForReplyTest.java should be cleaned up Reviewed-by: alanb

Merge

7023403: (ch) sun.nio.ch.SolarisEventPort.startPoll failed with AssertionError Reviewed-by: forax

7023244: (zipfs) langtools CompileTest fails on read-only file system Summary: replaced checkAccess with Files.isWritable() Reviewed-by: alanb

7023963: (misc) fix diamond anon instances in the jdk Reviewed-by: alanb, mchung, mcimadamore, dholmes

Merge

6944810: (ch) Assert failure in sun.nio.ch.PendingIoCache.clearPendingIoMap [win] Reviewed-by: chegar

Merge

7024264: HttpURLConnection/NetPermission doc issue Reviewed-by: chegar

Merge

6750362: Very large LDAP requests throw a OOM on LDAP servers which aren't aware of Paged Results Controls 6748156: add an new JNDI property to control the boolean flag WaitForReply Reviewed-by: vinnie, robm

6721694: java/lang/Thread/StartOOMTest.java fails with timeout or with crash Summary: the test is not suitable to be run automatically Reviewed-by: alanb

7018137: HTML4 compliance issues Summary: move end list items tags to after nested list Reviewed-by: alanb

7018606: (process) test/java/lang/ProcessBuilder/Basic.java failing intermittently (win) Reviewed-by: alanb

7021987: native2ascii "file cannot be read" error message is broken Reviewed-by: lancea, mchung

7022624: use try-with-resources in java.io tests Reviewed-by: alanb

7023034: Files.createTempDirectory((Path)null, "temp") does not throw NPE Reviewed-by: forax

7020531: test: java/security/cert/CertificateFactory/openssl/OpenSSLCert.java file not closed after run Reviewed-by: alanb, smarks

7021789: Remove jarsigner -crl option Reviewed-by: mullan

7022386: gethostbyname_r needs a pointer aligned buffer passed to it Summary: Change buffer type to ensure pointer-alignment Reviewed-by: alanb, chegar

7022269: clean up fscanf usage in Linux networking native code Reviewed-by: michaelm, alanb

7021582: convert jar/zip code and tests to use try-with-resources Reviewed-by: alanb, dholmes, sherman

7016707: Remove the BootClassLoaderHook for jkernel support Reviewed-by: alanb, ohair

7021939: com.oracle.net is not a NON_CORE_PKGS Reviewed-by: ohair, alanb

7022383: add reference to CR for ReadLongZipFileName test to problem list Reviewed-by: ohair

6835668: Use of /usr/include/linux/ files creates a dependence on kernel-headers Reviewed-by: chegar

6849693: index of fdTable should be less than num. of fdTable in jdk7 Reviewed-by: alanb

7020136: java/net/URLConnection/RedirectLimit.java fails intermittently Summary: Increase the socket timeout and clean up the test Reviewed-by: alanb

6844879: Source distribution should be more robustly built without the security source distribution Reviewed-by: ohair

Merge

7017493: ConcurrentLinkedDeque: Unexpected initialization order can lead to crash due to use of Unsafe Reviewed-by: chegar

7021209: convert lang, math, util to use try-with-resources Reviewed-by: alanb, darcy, naoto

6604496: Support for CKM_AES_CTR (counter mode) Summary: Enhanced SunPKCS11 provider to support AES/CTR/NoPadding transformation. Reviewed-by: vinnie

6702400: ChunkedInputStream expecting -1 from int read, but int->char comparision is wrong Reviewed-by: chegar

7021327: Changes for 7020888 included changes to other files in error Reviewed-by: chegar

7020888: (file) Miscellaneous and trivial clean-ups (typos and opportunities to use suppressed exceptions) Reviewed-by: mduigou, chegar

Merge

7020517: (fs) FileStore.equals returns true if both volumes have the same serial number Reviewed-by: chegar

7019705: Add -XX:+AggressiveOpts options to MOAT test Reviewed-by: alanb

Merge

Merge

6760148: Certain fonts are not correctly soft wrapped when using JTextComponent.print() Reviewed-by: peterz

Merge

6653511: JComponent.safelyGetGraphics() may sometimes return null Reviewed-by: rupashka

6796710: Html content in JEditorPane is overlapping on swing components while resizing the application. Reviewed-by: alexp

6835393: MidiSystem fails to correctly read Sequence with SMPTE division Reviewed-by: stayer

6660470: RealTimeSequencer incorrectly opens (implicitly) synthesizer Reviewed-by: stayer

6801206: SoundTestSuite: test050 fails Reviewed-by: stayer

6938426: Concurrency bug in ALAW encoder causes random bursts of static/noise in output. Reviewed-by: stayer

7013521: AudioSystem.write for AIFF files closes source audio stream Reviewed-by: dav

6826074: JScrollPane does not revalidate the component hierarchy after scrolling Reviewed-by: anthony