7012087: JSR 292 Misleading exception message for a non-bound MH for a virtual method Summary: Improve error message formatting to give more information to user. Also, catch a corner case related to 6930553 and 6844449. Reviewed-by: kvn

6981791: remove experimental code for JSR 292 Reviewed-by: twisti

6992789: assert(phi->_idx >= nodes_size()) failed: only new Phi per instance memory slice Summary: Swap checks: check for regular memory slice first and keep input phi. Reviewed-by: never

7034513: enable fast accessors and empty methods for ZERO and -Xint Reviewed-by: kvn, iveresov

7033779: CodeCache::largest_free_block may need to hold the CodeCache lock Reviewed-by: kvn

Merge

6777083: assert(target != __null,"must not be null") Reviewed-by: iveresov, kvn

Merge

7004547: regular loop unroll should not unroll more than max unrolling Summary: Take into account that after unroll conjoined heads and tails will fold. Reviewed-by: never

Merge

6528013: C1 CTW failure with -XX:+VerifyOops assert(allocates2(pc),"") Reviewed-by: kvn, iveresov

Merge

7033732: C1: When calling c2 arraycopy stubs offsets and length must have clear upper 32bits Summary: With 7033154 we started calling c2 arraycopy stubs from c1. On sparcv9 we must clear the upper 32bits for offset (src_pos, dst_pos) and length parameters when calling them. Reviewed-by: never, kvn

7026957: assert(type2aelembytes(store->as_Mem()->memory_type(), true) == 1 << shift->in(2)->get_int()) failed Reviewed-by: kvn, jrose

7032458: Zero and Shark fixes Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

7033154: Improve C1 arraycopy performance Summary: better static analysis. Take advantage of array copy stubs. Reviewed-by: never

7004535: Clone loop predicate during loop unswitch Summary: Clone loop predicate for clonned loops Reviewed-by: never

7032314: Allow to generate CallLeafNoFPNode in IdealKit Summary: Added CallLeafNoFPNode generation to IdealKit. Added i_o synchronization. Reviewed-by: never

6909440: C2 fails with assertion (_always_cold->is_cold(),"must always be cold") Reviewed-by: kvn

6385687: UseFastEmptyMethods/UseFastAccessorMethods considered harmful Reviewed-by: kvn, jrose, phh

Added tag hs21-b08 for changeset dff699fcdf23

Added tag jdk7-b138 for changeset dff699fcdf23

Added tag jdk7-b138 for changeset b4b1b3e184ee

Added tag jdk7-b138 for changeset 62b8e328f8c8

Merge

Merge

Merge

Merge

Merge

7034940: message drop 2 translation integration Reviewed-by: yhuang

7033660: Update copyright year to 2011 on any files changed in 2011 Reviewed-by: dholmes

Merge

Merge

7029979: (fs) Path.toRealPath(boolean) should be toRealPath(LinkOption...) Reviewed-by: mcimadamore, jjg

7010344: Some of the html files do not have element <a> in right context. Reviewed-by: jjg

7028405: (javac) remove unused JSR-292 code Reviewed-by: jrose, mcimadamore

Merge

Merge

7032633: javac -Xlint:all warns about flush() within try on an auto-closeable resource Summary: missing name check before calling MethodSymbol.overrides causes wrong warnings to be issued Reviewed-by: jjg

7031005: javap prints "extends java.lang.Object" Reviewed-by: mcimadamore

7031108: NPE in javac.jvm.ClassReader.findMethod in PackageElement.enclosedElements from AP in incr build Reviewed-by: darcy, mcimadamore

7027157: Project Coin: javac warnings for AutoCloseable.close throwing InterruptedException Summary: javac should warn about use/declaration of AutoCloseable subclasses that can throw InterruptedException Reviewed-by: jjg

7030150: Type inference for generic instance creation failed for formal type parameter Summary: Problem when explicit generic constructor type-arguments are used in conjunction with diamond Reviewed-by: jjg

7030606: Project-coin: multi-catch types should be pairwise disjoint Summary: Bring javac in sync with latest Project Coin EDR Reviewed-by: jjg

7030687: Diamond: compiler accepts erroneous code where diamond is used with non-generic inner class Summary: Diamond accepts non-parameterized member inner classes with parameterized outer because of a bad check Reviewed-by: jjg

7001086: NLS: un-used resources should be removed from standard.properties and improper concatenation Reviewed-by: jjg

6437138: JSR 199: Compiler doesn't diagnose crash in user code 6482554: uncaught exception from annotation processor not reported through JavaCompiler.CompilationTask.call Reviewed-by: mcimadamore

7009599: javac build puts extraneous files into dist/lib/classes.jar Reviewed-by: ohair

6597678: JavaCompiler.getStandardFileManager always uses default charset not the one that user specifies Reviewed-by: mcimadamore

7010342: End tag for element P is not open for few html files generated using new javadoc Reviewed-by: jjg

7025314: NLS: translatability violation on standard.properties Reviewed-by: jjg

Added tag jdk7-b137 for changeset ec825a21d1f8

Merge

Merge

7033660: Update copyright year to 2011 on any files changed in 2011 Reviewed-by: dholmes

Added tag jdk7-b137 for changeset e7ad21289bd4

Merge

Merge

7033660: Update copyright year to 2011 on any files changed in 2011 Reviewed-by: dholmes

Added tag jdk7-b137 for changeset 4d1bb30e7cb5

Merge

Merge

Merge

7034940: message drop 2 translation integration Reviewed-by: yhuang

7033660: Update copyright year to 2011 on any files changed in 2011 Reviewed-by: dholmes

Added tag jdk7-b137 for changeset 81da7c8abcbd

Merge

Merge

Merge

7033957: Library built without a mapfile: libxinerama.so Reviewed-by: ksrini

Merge

Merge

Merge

Merge

Merge

7024528: [sv] format error in appletviewer usage translation Reviewed-by: yhuang

7034940: message drop 2 translation integration Reviewed-by: yhuang

7034932: Merging src/share/classes/sun/util/resources/CurrencyNames.properties and CurrencyNames_pt.propertie Reviewed-by: yhuang

6384973: Incorrect translations in awt.properties Reviewed-by: yhuang

7020583: Some currency names are missing in some locales Reviewed-by: naoto

7022841: LocaleNames_no_NO_NY.class is missing in rt.jar Reviewed-by: katleman, ohair

7019210: Fix misc references to /bugreport websites Reviewed-by: skannan

7033660: Update copyright year to 2011 on any files changed in 2011 Reviewed-by: dholmes

Merge

6817525: turn on method handle functionality by default for JSR 292 Summary: JVM bug 6817525 requires changes to some JDK unit tests; update test invocation flags and "Indify" snapshot Reviewed-by: kvn, twisti

Merge

7035109: Regression: awt SplashScreen/test18.sh fails - missing mapfile entry Reviewed-by: alanb, ksrini

Merge

6565585: Remove critical section in Method.invoke, Constructor.newInstance, Field.getFieldAccessor improving performance Reviewed-by: alanb, dholmes, briangoetz

Merge

7030249: Eliminate use of LoadLibrary and other clean-ups Reviewed-by: ohair, chegar, mchung

7033568: (file) Miscellaneous typos Reviewed-by: michaelm, mduigou

7029979: (fs) Path.toRealPath(boolean) should be toRealPath(LinkOption...) Reviewed-by: sherman

Merge

6751338: ZIP inflater/deflater performance Summary: To use GetPrimitiveArrayCritical for bye array access Reviewed-by: bristor, alanb

6543593: (reflect) Clarify private final field mutability Reviewed-by: dholmes, alanb, mduigou

Merge

7005628: Clarify NPE behavior of Throwable.addSuppressed(null) Reviewed-by: dholmes, mchung, jjb

7032866: Problem with fix for 7030256 Reviewed-by: alanb

7030400: 3/4 PrivateTransportTest.sh needs adjustment to work with 7003964 Summary: Fix typo in GetModuleHandle() function lookup. Reviewed-by: dholmes, alanb, acorn, zgu

7032364: Add jvm.cfg file for ARM and PPC architectures Reviewed-by: darcy, bdelsart, alanb, mduigou

Merge

7026507: Bidi initialization fails if AWT not present Reviewed-by: okutsu

6381464: SimpleFormatter should use one single line format Summary: Define a new logging properties to support custom output format Reviewed-by: alanb

7024172: Move BufferPoolMXBean and PlatformLoggingMXBean java.lang.management Reviewed-by: alanb

Merge

7019937: Translatability bug - Remove Unused String - String ID , read end of file 7019938: Translatability bug - Remove Unused String - String ID can not specify Principal with a 7019940: Translatability bug - Remove unused string - String ID: provided null name 7019942: Translatability bug - String ID: trustedCertEntry, 7019945: Translatability bug - Translatability issue - String ID: * has NOT been verified! In order to veri 7019947: Translatability bug - Translatability issue - String ID: * The integrity of the information stored i 7019949: Translatability bug - Translatability issue - String ID: * you must provide your keystore password. Reviewed-by: weijun, wetmore

7031929: Variable names typos in Release-embedded.gmk Reviewed-by: alanb

7031166: (pack200) tools/pack200/CommandLineTests.java fail with testsdk on RO filesystem Reviewed-by: alanb

7031536: test/sun/security/krb5/auto/HttpNegotiateServer.java should not use static ports Reviewed-by: xuelei

7019384: Realm.getRealmsList returns realms list in wrong (reverse) order Reviewed-by: xuelei

7031376: Typos in javadoc of TimSort classes Reviewed-by: darcy Contributed-by: jjb@google.com

7031371: Clarify javadoc of Throwable, including addSuppressed Reviewed-by: smarks, mduigou

7030442: Add missing @param tag for Collections.reverseOrder() Reviewed-by: darcy, alanb

7030256: Cleanup/Remove code supporting old Windows versions (98, NT, 2000, etc) Reviewed-by: alanb, mduigou

7030063: AWT support for SE-Embedded integration Summary: AWT support for SE-Embedded Reviewed-by: anthony, art, bobv, collins, alanb

7023056: NPE from sun.security.util.ManifestEntryVerifier.verify during Maven build Reviewed-by: mullan

7029680: fix test/sun/misc/Version/Version.java build parsing Reviewed-by: ohair

7029823: (ann) test/java/lang/annotation/package-info.java no longer compiles Summary: Use @Deprecated instead of @java.lang.annotation.Documented Reviewed-by: jjg, smarks

7030174: Jarsigner should accept TSACert with an HTTPS id-ad-timeStamping SIA Reviewed-by: xuelei

7030523: regression: imporper checking of paramater Reviewed-by: weijun

7029848: KeyStoreBuilderParameters((Builder)null) does not throw NullPointerException Summary: throws NPE for null Builder Reviewed-by: weijun

7029997: Restyling of SortedMap Javadoc Reviewed-by: darcy, chegar

7028490: better suggestion for jarsigner when TSA is not accessible Reviewed-by: mullan

7025066: Build systems changes to support SE Embedded Integration Summary: Define Embedded specific files and include them in the main files. Allow finer control over some build options. Reviewed-by: ohair, bobv, collins

6737397: Should support running JCK test suite with test/Makefile and JPRT Reviewed-by: alanb

7027797: take care of ECDH_anon/DH_anon server key exchange for TLS 1.2 Summary: the signature of server key exanage message could be null Reviewed-by: vinnie

Merge