Merge

7034532: (fs) AssertionError when working directory is UNC Reviewed-by: forax, mduigou

7033561: Missing Unicode Script aliases Summary: added 6.0 aliases Reviewed-by: okutsu, peytoia, alanb

7030180: AES 128/256 decrypt exception Reviewed-by: valeriep

7012160: read SF file in signed jar in streaming mode Reviewed-by: mullan

7035020: ForkJoinPool.invoke may deadlock if parallelism = 1 Reviewed-by: chegar

6976117: SSLContext.getInstance("TLSv1.1") returns SSLEngines/SSLSockets without TLSv1.1 enabled Summary: Reorg the SSLContext implementation Reviewed-by: weijun

7034700: (unpack200) build fails with fastdebug builds Reviewed-by: ohair

7029048: (launcher) fence the launcher against LD_LIBRARY_PATH Reviewed-by: mchung, ohair

7034656: Address lint warnings for DriverManager Reviewed-by: alanb, forax, ohair

7034657: Update Creative Commons license URL in legal notices Reviewed-by: chegar

7033954: (launcher) Launchers not built with mapfiles Reviewed-by: ohair

7032354: no-addresses should not be used on acceptor side Reviewed-by: valeriep

7034471: Wrap registeredDrivers in DriverManager Reviewed-by: alanb, briangoetz

Merge

7034155: (ch) NullPointerException in sun.io.ch.IOUtil when OOM is thrown Reviewed-by: forax

7031546: test/java/util/ResourceBundle/Bug4168625Test.java fails on solaris10u9 sparc. Reviewed-by: okutsu

6312706: Map entrySet iterators should return different entries on each call to next() Reviewed-by: mduigou, alanb Contributed-by: Neil Richards <neil.richards@ngmr.net>

Merge

7034614: The insets of TitledBorder vary, will be modified by another method, in JDK7 Reviewed-by: rupashka

Merge

7036148: NullPointerException with null JMenu name Reviewed-by: rupashka

6985329: 9 classes in swing.plaf contains words inappropriate for public spec - about some compiler bug Reviewed-by: rupashka

Merge

7032903: javax/swing/JComponent/6989617/bug6989617.java test fails against jdk7 Reviewed-by: rupashka

7035446: some regression tests take too long Reviewed-by: peytoia

7036842: HTML tag mismatch in API doc for ChoiceFormat Reviewed-by: okutsu

7032911: javax/swing/JLabel/7004134/bug7004134.java test fails against jdk7 Reviewed-by: malenkov

7028818: (lc) Lazily initialize locale extension 7029740: (lc) New Locale class implementation doesn't follow the Java coding conventions 7032820: (lc) sun.util.locale.InternalLocaleBuilder.CaseInsensitiveChar.equals problems 7033503: (lc) Restore optimization code for Locale class initialization 7033504: (lc) incompatible behavior change for ja_JP_JP and th_TH_TH locales Reviewed-by: naoto

7030774: javax/swing/text/CSSBorder/6796710/bug6796710.java test fails against jdk7 b134 Reviewed-by: malenkov

7032376: A type parameter isn't seen by using an web browser Reviewed-by: malenkov

7034231: Default font appears twice in fallback font list Reviewed-by: okutsu, prr

7035073: Add missing timezones to TimeZoneNames_pt_BR.java Reviewed-by: okutsu

7025525: CSS property list in javax.swing.text.html.CSS is incomplete Reviewed-by: alexp

7030623: closed/javax/accessibility/4864610/bug4864610.java test fails just against jdk7 b134 Reviewed-by: peterz

6596966: Some JFileChooser mnemonics do not work with sticky keys Reviewed-by: alexp

6849232: closed/javax/swing/text/GlyphPainter2/6427244/bug6427244.java fails on RHEL5 Reviewed-by: peterz

6992523: FindBugs scan - Malicious code vulnerability Warnings in com.sun.media.sound.* Reviewed-by: alexp

7009127: [Spec clarification request] Wrapping the devices retrieved from MidiDeviceProvider Reviewed-by: alexp

7003777: Nonexistent html entities not parsed properly. Reviewed-by: peterz

6973777: JCK manual case JEditorPaneTests.html#JEditorPane fails in jdk7 b100 Reviewed-by: peterz

Merge

Merge

6983562: Two java/awt tests failing just on jdk7b108 Reviewed-by: art, denis, dcherepanov

7032566: Toolkit.areExtraMouseButtonsEnabled() not alws correspnd "sun.awt.enableExtraMouseButtons" sys prop Reviewed-by: art, dcherepanov

7021001: Default implementation of Toolkit.loadSystemColors(int[]) and many others doesn't throw HE in hl env Reviewed-by: dcherepanov

7036540: A change for 7021001 and some makefile changes have been pushed as a part of 7030062 Reviewed-by: dcherepanov

7030062: duplicate free Reviewed-by: dcherepanov

7008513: Case TranslucentJAppletTest.jtr automatically failed due to java.lang.RuntimeException Summary: Set transparent background to the applet Reviewed-by: art, dcherepanov

7029832: Buffer overrun at awt_LoadLibrary.c (and java_props_md.c) Reviewed-by: anthony, art

7027013: Regression: JComponent.revalidate() has no effect on invisible components Summary: Dialog.conditionalShow() should call validateUnconditionally() instead of simple validate() Reviewed-by: art, dcherepanov

7031854: JCK 7 test FileDialogTest0001 fails on Windows with Russian locale Reviewed-by: uta, dcherepanov

7016889: GraphicsDevice.setFullScreenWindow() spec for simulated full-screen mode is not always correct Reviewed-by: art, anthony

7002839: Static initialization deadlock between sun.awt.Win32GraphicsEnvironment and sun.awt.windows.WToolkit Reviewed-by: art, dcherepanov, denis

6998877: After double-click on the folder names , FileNameOverrideTest FAILED Reviewed-by: art, dcherepanov, anthony

Merge

6942504: test/javax/imageio/metadata/DOML3Node.java fails Reviewed-by: bae, jgodinez

7036275: EUDC character is not displayed on Swing if ClearType is enabled Reviewed-by: igor, jgodinez

7004984: Features.h was renamed to ICUFeatures.h and should be removed Reviewed-by: srl

7033534: Two tests fail just against jdk7 b136 Reviewed-by: jgodinez, prr

6983666: Typo in JavaDoc comments within FileCacheImageOutputStream Reviewed-by: jgodinez

Added tag jdk7-b139 for changeset 9d9c9b8d0e5c

Merge

7039044: Bump the HS21 build number to 10 Summary: Update the HS21 build number to 10 Reviewed-by: jcoomes

Merge

Merge

7036706: G1: Use LIR_OprDesc::as_pointer_register in code changes for 7035117 Summary: Use LIR_OprDesc::as_pointer_register() instead as_register/as_register_lo combination in the code changes for 7035117. Reviewed-by: iveresov

7036021: G1: build failure on win64 and linux with hs21 in jdk6 build environment Summary: Missing parentheses around a casted expression and some missing casts were causing build failures with the jdk6 build tools. Reviewed-by: kvn, brutisso

Merge

7036482: clear argument is redundant and unused in cardtable methods Summary: Removed the unused clear argument to various cardtbale methods and unused mod_oop_in_space_iterate method. Unrelated to synopsis, added a pair of clarifying parens in AllocationStats constructor. Reviewed-by: brutisso, jcoomes

Merge

7035117: G1: nsk/stress/jni/jnistress002 fails with assertion failure Summary: Allow long type for offset in G1 code in compiler implementations of Unsafe.getObject Reviewed-by: never, iveresov

Merge

Merge

6841742: par compact - remove unused/unsupported options Summary: ignore UseParallel{OldGCDensePrefix,OldGCCompacting,DensePrefixUpdate} Reviewed-by: jwilhelm, brutisso

7034133: cleanup obsolete option handling Reviewed-by: ysr, johnc, poonam

7009266: G1: assert(obj->is_oop_or_null(true )) failed: Error Summary: A referent object that is only weakly reachable at the start of concurrent marking but is re-attached to the strongly reachable object graph during marking may not be marked as live. This can cause the reference object to be processed prematurely and leave dangling pointers to the referent object. Implement a read barrier for the java.lang.ref.Reference::referent field by intrinsifying the Reference.get() method, and intercepting accesses though JNI, reflection, and Unsafe, so that when a non-null referent object is read it is also logged in an SATB buffer. Reviewed-by: kvn, iveresov, never, tonyp, dholmes

7032963: StoreCM shouldn't participate in store elimination Reviewed-by: kvn

Merge

7007254: NullPointerException occurs with jvisualvm placed under a dir. including Japanese chars Summary: use java_lang_String::create_from_platform_dependent_str() instead of java_lang_String::create_from_str() in JvmtiEnv::AddToSystemClassLoaderSearch() Reviewed-by: dcubed

7032407: Crash in LinkResolver::runtime_resolve_virtual_method() Summary: Make CDS reorder vtables so that dump time vtables match run time order, so when redefine classes reinitializes them, they aren't in the wrong order. Reviewed-by: dcubed, acorn

Merge

Merge

Merge

7005865: Crash when running with PrintIRWithLIR Summary: the failure is caused by uninitialized bci number Reviewed-by: iveresov

7033100: CreateMinidumpOnCrash does not work for failed asserts Summary: Passing NULL as MINIDUMP_EXCEPTION_INFORMATION when calling MiniDumpWriteDump when crash is due to assertion instead of real exception to avoid creating zero-length mini dump file. Reviewed-by: acorn, dcubed, poonam, coleenp

Added tag hs21-b09 for changeset 3d6edd0ae4e9

Added tag jdk7-b139 for changeset 3d6edd0ae4e9

Added tag jdk7-b139 for changeset f8890645b255

Added tag jdk7-b139 for changeset 955488f34ca4

Merge

Merge

Added tag jdk7-b138 for changeset 7a2738b5e9c6

Merge

Added tag jdk7-b138 for changeset 63c8767f5915

Merge

Added tag jdk7-b138 for changeset 0319b53ef05f

Merge

Added tag jdk7-b138 for changeset 33b454ccd9f2

Merge

Merge

7018125: Reverting the JFB version string for JDK releases Reviewed-by: katleman

Merge

Merge

7036905: [de] dem - the german mark display name is incorrect Reviewed-by: naoto

Merge

7019529: JSR292: java/dyn/ClassValueTest.java depends on sub-test execution order Summary: Test should not use static variables, because they may contain stale values. Reviewed-by: twisti

Added tag jdk7-b138 for changeset 26c2c1de1631

Merge

7037174: Bump the HS21 build number to 09 Summary: Update the HS21 build number to 09 Reviewed-by: jcoomes

Merge

Merge

Merge

7036220: Shark fails to find LLVM 2.9 System headers during build Reviewed-by: gbenson, twisti Contributed-by: Xerxes Ranby <xerxes@zafena.se>

7036236: VM crashes assert((!inside_attrs()) || is_error_reported()) failed ... Summary: Eliminate the race condition. Reviewed-by: kvn

6988308: assert((cnt > 0.0f) && (prob > 0.0f)) failed: Bad frequency assignment in if Summary: Make sure cnt doesn't become negative and integer overflow doesn't happen. Reviewed-by: kvn, twisti

7035870: JSR 292: Zero support Summary: This adds support for JSR 292 to Zero. Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

7035713: 3DNow Prefetch Instruction Support Summary: The upcoming processors from AMD are the first that support 3dnow prefetch without supporting the 3dnow instruction set. Reviewed-by: kvn Contributed-by: tom.deneau@amd.com

6987991: JSR 292 phpreboot test/testtracefun2.phpr segfaults Summary: Make MH verification tests more correct, robust, and informative. Fix lingering symbol refcount problems. Reviewed-by: twisti

Merge

7034585: Adjust fillInStackTrace filtering to assist 6998871 Summary: Allow for one or more fillInStackTrace frames to be skipped Reviewed-by: mchung, kvn

7034625: Product builds in Visual Studio projects should produce full symbol information Summary: Add the /debug flag to the linker command in Visual Studio Reviewed-by: mgronlun, poonam, hosterda

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

7009276: Add -XX:+IgnoreUnrecognizedVMOptions to several tests Reviewed-by: kvn

7030388: JCK test failed to reject invalid class check01304m10n. Summary: Restrict fix for 7020118 to only when checking exception handlers Reviewed-by: dcubed, dholmes

7010849: 5/5 Extraneous javac source/target options when building sa-jdi Summary: Make code changes necessary to get rid of the '-source 1.4 -target 1.4' options. Reviewed-by: dholmes, dcubed

7032775: Include Shark code in the build again Reviewed-by: ohair Contributed-by: gbenson@redhat.com, ahughes@redhat.com

7017193: Small memory leak in get_stack_bounds os::create_stack_guard_pages Summary: getline() returns -1 but still allocate memory for str Reviewed-by: dcubed, coleenp

Merge

7035161: assert(!o->is_null_object()) failed: null object not yet handled here. Reviewed-by: kvn

Merge

7004555: Add new policy for one iteration loops Summary: Add new policy for one iteration loops (mostly formal pre- loops). Reviewed-by: never

7034967: C1: assert(false) failed: error (assembler_sparc.cpp:2043) Summary: Fix -XX:+VerifyOops Reviewed-by: kvn, never

7034957: acquiring lock CodeCache_lock/1 out of order with lock tty_lock/0 -- possible deadlock Reviewed-by: iveresov

7009600: JSR 292 Server compiler crashes in Compile::find_intrinsic(ciMethod*, bool) Summary: catch errors during the compile-time processing of method handles; back out cleanly Reviewed-by: twisti

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