7185471: Avoid key expansion when AES cipher is re-init w/ the same key Summary: Saved the last cipher key value and skip key expansion if key value is the same. Reviewed-by: weijun, xuelei

7107616: scalability bloker in javax.crypto.JceSecurityManager Summary: Changed the type of field "exemptCache" from HashMap to ConcurrentHashMap. Reviewed-by: weijun, xuelei

7107613: scalability bloker in javax.crypto.CryptoPermissions Summary: Changed the type of field "perms" from Hashtable to ConcurrentHashMap. Reviewed-by: weijun, xuelei

Merge

7187962: sun.security.pkcs11.P11DSAKeyFactory.implTranslatePublicKey doesn't check if params is null Reviewed-by: valeriep

7189363: Regex Pattern compilation buggy for special sequences Summary: fixed the incorrect implementation in expr(...) Reviewed-by: psandoz, alanb

Merge

7186371: [macosx] Main menu shortcuts not displayed (7u6 regression) Reviewed-by: leonidr

Merge

7160609: [macosx] JDK crash in libjvm.dylib ( C [GeForceGLDriver+0x675a] gldAttachDrawable+0x941) Summary: Constrain window dimensions with screen bounds and GL_MAX_TEXTURE_SIZE Reviewed-by: art, serb

7193169: The code example in javadoc of Component.java misses 'implements' keyword Reviewed-by: anthony

6866747: J2SE_Swing_Reg:can not see any HSB tab Reviewed-by: alexsch

7189112: java.beans.Introspector misses write methods Reviewed-by: rupashka

7188612: JTable's AccessibleJTable throws IllegalComponentStateException instead of null Reviewed-by: rupashka

7190597: Nimbus: regtest for 4235420 fails Reviewed-by: alexsch