6937112: String.lastIndexOf confused by unpaired trailing surrogate Summary: Rewrite lastIndexOf for performance and correctness Reviewed-by: sherman Contributed-by: Reviewed by Ulf Zibis <ulf.zibis@gmx.de>

6934265: Add public method Character.isBmpCodePoint Summary: Move isBmpCodePoint from sun.nio.cs.Surrogate to Character Reviewed-by: sherman Contributed-by: Ulf Zibis <ulf.zibis@gmx.de>

6934268: Better implementation of Character.isValidCodePoint Summary: Use the cleverest possible bit-twiddling micro-optimizations Reviewed-by: sherman Contributed-by: Ulf Zibis <ulf.zibis@gmx.de>

Merge

6213702: (so) non-blocking sockets with TCP urgent disabled get still selected for read ops (win) Reviewed-by: michaelm, chegar

6856415: Enabling java security manager will make programe thrown wrong exception ( main method not found ) Reviewed-by: darcy

6961029: java/net/BindException/Test.java should not use wildcard address Reviewed-by: michaelm, alanb

Merge

6954525: Testcase failure java/net/Authenticator/B4769350.java Reviewed-by: michaelm, weijun

Merge

6963828: TEST_BUG: java/nio/channels/FileTransfer.java takes too long (win) Reviewed-by: chegar

6964311: Build regression due to rt.jar contents change Summary: The fix for 6933622 regressed control builds, this is a workaround fix, filed 6964313 to find the right answer to why it happened and how to fix it correctly. Reviewed-by: alanb, darcy

6946669: SSL/Krb5 should not call EncryptedData.reset(data, false) Reviewed-by: xuelei

6844907: krb5 etype order should be from strong to weak Reviewed-by: valeriep

6958026: Problem with PKCS12 keystore Reviewed-by: mullan

6911258: Project Coin: Add essential API support for Automatic Resource Management (ARM) blocks 6911261: Project Coin: Retrofit Automatic Resource Management (ARM) support onto platform APIs 6962571: Infinite loop in printing out Throwable stack traces with circular references Reviewed-by: darcy, alanb Contributed-by: jjb@google.com

Merge

6963027: TEST_BUG: channels and buffer tests need to run in samevm mode Reviewed-by: ohair, sherman, chegar

6931566: NetworkInterface is not working when interface name is more than 15 characters long Summary: Separate Linux and Solaris code, use lifreq under Solaris Reviewed-by: chegar

Merge

6933622: Duplicate class files in rt.jar and charsets.jar 6895003: JarReorder is not excluding a requested file. Reviewed-by: jjg

6939022: Source code adjustments for parfait compilation Reviewed-by: jjg

Merge

6942989: 2/2 Memory leak of java.lang.ref.WeakReference objects Summary: Use ReferenceQueues to manage WeakReferences in LogManager and Logger. Reviewed-by: dholmes, alanb, emcmanus, tonyp Contributed-by: jeremymanson@google.com

Merge

6963156: TEST_BUG: Several tests under sun/nio/cs failed Summary: Updated the test cases and removed them from ProblemList.txt Reviewed-by: alanb

6931871: Rebranding of javadoc generation in makefiles 6951293: control docs target does not work on windows Reviewed-by: jjg

Merge

6963811: Deadlock-prone locking changes in Introspector Reviewed-by: peterz, rupashka

6894597: test/closed/javax/swing/JPopupMenu/6495920/bug6495920.java fails Reviewed-by: alexp, peterz

6520101: FileChooser will cause OutOfMemory when application will run long time Reviewed-by: peterz

6937415: Some components return undocumented default values under Nimbus LaF Reviewed-by: peterz

6711682: JCheckBox in JTable: checkbox doesn't alaways respond to the first mouse click Reviewed-by: rupashka

6959266: test javax/swing/JInternalFrame/6725409/bug6725409.java should be modified Reviewed-by: alexp

4129681: Cannot get a title border to display its label as disabled Reviewed-by: alexp, rupashka

Merge

6963870: NPE in CompoundBorder.getInsets() Reviewed-by: alexp Contributed-by: jon.vanalten@redhat.com

6684401: JTree isExpanded should not call itself recursively Reviewed-by: rupashka

6777378: NullPointerException in XPDefaultRenderer.paint() Reviewed-by: rupashka

6959260: javax/swing/JLabel/6501991/bug6501991.java failed on build 1.7.0-ea-b96 Reviewed-by: rupashka

6707234: Method returned by Introspector.internalFindMethod not necessarily most specific Reviewed-by: peterz

Merge

Merge

6959174: Need to introduce sun.awt.disableGtkFileDialogs system property Reviewed-by: art, anthony

6966643: GTK FileDialog hangs when user manually closes it Reviewed-by: art

6424157: java.awt.EventQueue push/pop might cause threading issues Reviewed-by: ant, dcherepanov

6957166: With XAWT, set arguments properly creating a MouseWheelEvent. Summary: swap some parameters to allow bigger values for click count. Reviewed-by: dav

Merge

6968373: FontUtilities static initializer throws AccessControlException Reviewed-by: prr

6959998: Return of SurfaceData_InitOps point not checked in all cases (parfait found these) Reviewed-by: prr Contributed-by: ohair <kelly.ohair@oracle.com>

6967050: JDK build issues with cygwin/vc2010 Reviewed-by: prr, ohair

Merge

6943487: NPE in makeMultiCharsetString while printing on linux Reviewed-by: igor, jgodinez

Added tag jdk7-b101 for changeset 47da38a8c0f0

Merge

Merge

Merge

Merge

6968336: VM crash guarantee(!nm->is_zombie()) failed: cannot lock a zombie method Reviewed-by: twisti

6968368: SIGSEGV in the BCEscapeAnalyzer::copy_dependencies Summary: Use GrowableArray and VectorSet allocated in ciEnv arena. Reviewed-by: never, twisti

6968646: JVM crashes with SIGFPE during startup Summary: Check that cpuid returns valid values for processor topology (not zeros). Reviewed-by: never, twisti

6968385: malformed xml in sweeper logging Reviewed-by: kvn

6958668: repeated uncommon trapping for new of klass which is being initialized Reviewed-by: kvn, jrose

6965184: possible races in make_not_entrant_or_zombie Reviewed-by: kvn