Merge

Merge

7044019: LocaleEnhanceTest.java needs to be updated for 7004603 Reviewed-by: naoto

Merge

7004603: L10n needed for newly added codes in LocaleNames Reviewed-by: naoto

7043684: Update man pages for JDK 7 tools Reviewed-by: skannan

Merge

7043548: message drop 3 translation integration Reviewed-by: yhuang

7038807: [CCJK] OK button on message dialog of JOptionpane is not translated Reviewed-by: yhuang

7042475: [ja,zh_CN] extra mnemonic key in jconsole Reviewed-by: yhuang

7028447: security-related resources Chinese translation errors Reviewed-by: weijun

7042323: [sv, de, es, it] Print dialog has duplicate mnemonic key Reviewed-by: yhuang

7043580: integrate man page translation drop 2 into jdk7 Reviewed-by: yhuang

7021691: Most log level words are not translated in java logging Reviewed-by: yhuang

Merge

Merge

Merge

Merge

Merge

7028071: Add two attributes to the OperatingSystemMXBean to provide CPU Load info Summary: Add getProcessCpuLoad() and getSystemCpuLoad() to the OperatingSystemMXBean Reviewed-by: acorn, dholmes, mchung

Merge

Merge

6738532: Error in Elliptic Curve NamedCurve determination. (related to PKCS11) Reviewed-by: valeriep

Merge

7035172: Reintroduce LICENSE file in JDK/JRE bundle Reviewed-by: billyh

Merge

Merge

Merge

7041044: InetAddress.getByName(String,InetAddress) added in error Reviewed-by: alanb

7040151: SPNEGO GSS code does not parse tokens in accordance to RFC 2478 Reviewed-by: valeriep

7041136: Use Objects.equals in JDK platform classes Reviewed-by: alanb, mduigou

7040220: java/char_encodin Optimize UTF-8 charset for String.getBytes()/new String(byte[]) Summary: implement sun.nio.cs.ArrayEn/Decoer in utf8 Reviewed-by: alanb

6553182: Need to modify javadoc doclet for GPL Reviewed-by: jjg

Merge

6569621: Problem with java/classes_net Reviewed-by: chegar

7036522: j.u.r.Pattern documentation errors Summary: updated the Perl related information Reviewed-by: alanb

7040916: DynamicKeyTab test fails on Windows Reviewed-by: xuelei

Merge

7040572: Fix broken java/nio/charset/StandardCharset/Standard.java and add more tests. Reviewed-by: alanb

7036252: sunpkcs11-solaris.cfg needs a review Summary: Updated the disabled mechanisms section since Solaris bug 6306708 has been fixed. Reviewed-by: mullan

7039809: Remove @ConstructorProperties annotation from java.io.File class Reviewed-by: alanb, malenkov

7040150: Indexing Error in CachedRowSetImpl.removeCurrentRow Reviewed-by: smarks

7039066: j.u.rgex does not match TR18 RL1.4 Simple Word Boundaries and RL1.2 Properties Summary: updated the regex Unicode property support Reviewed-by: alanb

7037261: j.l.Character.isLowerCase/isUpperCase need to match the Unicode Standard Summary: updated j.l.c.lsLowerCase/isUpperCase Reviewed-by: okutsu

7038843: IIOP serialization fails with NullPointerException when serializing Throwable Reviewed-by: dholmes, mchung

6578658: Request for raw RSA (NONEwithRSA) Signature support in SunMSCAPI Reviewed-by: wetmore

Merge

7040381: Add StandardCharset.java to FILES_java.gmk Reviewed-by: alanb

7037081: Remove com.sun.tracing from NON_CORE_PKGS Reviewed-by: ohair, jjg, jmasa

7038565: address Findbugs issue in BatchUpdateException Reviewed-by: alanb, forax

7037201: regression: invalid signed jar file not detected Reviewed-by: mullan

Merge

4884238: Adds java.nio.charset.StandardCharset to provide static final constants for the standard charsets. Reviewed-by: alanb, sherman, darcy

Merge

6753664: Support SHA256 (and higher) in SunMSCAPI Reviewed-by: mullan

7039186: (ch) EPoll based asynchronous I/O implementation should be portable to linux-arm and linux-ppc Reviewed-by: dholmes

6950929: Failures on Solaris sparc 64bit sun/security/krb5/auto/BadKdc4.java (and linux?) Reviewed-by: xuelei

7039369: Limit range of strictfp in FloatingDecimal Summary: Additional reviews by sergey.kuksenko@oracle.com Reviewed-by: alanb

7029383: Refresh of non-client demos Reviewed-by: mchung, ohair

6931562: Support SunMSCAPI Security Provider in Windows 64-bit releases of JVM Reviewed-by: mullan

Merge

Merge

6519228: JDWP Spec: need references at capability canRequestMonitorEvents for JDWP 1.6 Monitor* events Summary: Add descriptions in event type table Reviewed-by: ohair, jjh, acorn, dcubed

7038885: Improved bulk operation disclaimers for concurrent collections Reviewed-by: chegar

7025227: SSLSocketImpl does not close the TCP layer socket if a close notify cannot be sent to the peer 6932403: SSLSocketImpl state issue Reviewed-by: xuelei

6998871: Support making the Throwable.stackTrace field immutable Reviewed-by: dholmes, mchung, forax

Merge

7038175: Expired PKITS certificates causing CertPathBuilder and CertPathValidator regression test failures Reviewed-by: xuelei

Merge

Merge

6732372: Some MSCAPI native methods not returning correct exceptions. Reviewed-by: mullan

7038542: Small performace regression in ConcurrentHashMap on c1 since CR 703655 Reviewed-by: chegar

Merge

6888925: SunMSCAPI's Cipher can't use RSA public keys obtained from other sources. Reviewed-by: mullan

7038501: Clarify meaning of "(optional)" in javadoc Reviewed-by: chegar

6546713: link the word (optional) in exception specifications to the text which provides explanation and context. Reviewed-by: dholmes, dl

6896297: (rmi) fix ConcurrentModificationException causing TCK failure Reviewed-by: alanb, dholmes, peterjones

Merge

7034570: java.lang.Runtime.exec(String[] cmd, String[] env) can not work properly if SystemRoot not inherited Reviewed-by: dholmes, alanb

6894072: always refresh keytab Reviewed-by: valeriep

7030579: Extra words in documentation of ListIterator may cause confusion Reviewed-by: dholmes, alanb

7027900: (fs) glob syntax under-specified Summary: Clarify how leading dots are treated in nio2 glob Reviewed-by: alanb

Merge

Merge

6979551: closed/javax/swing/plaf/basic/BasicLabelUI/4798542/bug4798542.java fails Reviewed-by: art, yan, alexp

6888633: test/closed/javax/swing/JPopupMenu/4786415/bug4786415.java fails Reviewed-by: rupashka, alexp

7035209: 6u26 ea b01 - running an applet with old plugin crashes in awt.dll Reviewed-by: art, amenkov

7039403: Could not compile test/javax/swing/JLabel/6596966/bug6596966.java Reviewed-by: malenkov

7039469: (tz) Support tzdata2011g Reviewed-by: okutsu

7036871: Some JCK interactive JSplitPane tests that test continuous layout fail with Nimbus L&F Reviewed-by: rupashka

7021058: The Create folder button produces error in the Details mode (JFileChooser) Reviewed-by: malenkov

7030629: closed/sun/audio/AudioClipClose/AudioClipClose.java test fails just against jdk7 b134 7033899: SoundTestSuite: test050 fails on Ubuntu Linux Reviewed-by: bae

7036025: java.security.AccessControlException when creating JFileChooser in signed applet Reviewed-by: malenkov

Merge

7016528: Deadlock during mutual initialization of DataTransferer and DataTransferer$DataFlavorComparator Reviewed-by: dav, art, denis

Merge

7026055: Regression : Cannot use IME on JComboBox Japanese Reviewed-by: art, ant, naoto

7034291: Regression : Preedit String on active client is committed into unexpected component Reviewed-by: art, naoto

7034766: closed/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java failed on jdk7 b134 Reviewed-by: art, ant

6853146: Regression: on-the-spot input is broken in AWT Peered components Reviewed-by: art, ant, naoto

6956646: Test: MouseWheelEvent/InfiniteRecursion test receives more MouseWheelEvents than expected Reviewed-by: serb, dcherepanov

7032830: GraphicsDevice.setFullScreenWindow() works strange for decorated windows on OEL. 7016382: GraphicsDevice.setFullScreenWindow() - spec clarification for exclusive mode for dec/undec Frames Reviewed-by: art

6998716: client vm crashes making browser fails to respond under some scenarios Reviewed-by: art, denis, uta

7020922: java.awt.Toolkit.getPropertyChangeListeners() should mention that it returns proxies Reviewed-by: malenkov

6888182: Readable and permitted to delete files could not be transferred through Clipboard and DnD Reviewed-by: uta

7030632: Pasting HTML that was copied from MS Word results in IOException Reviewed-by: uta, denis

7036733: Regression : NullPointerException when scrolling horizontally on AWT List Reviewed-by: dcherepanov

7036669: Simplify revalidating component hierarchy with multiple validate roots Summary: Introduce Component.revalidate() method Reviewed-by: art, alexp

Merge

6563734: Path2D.Float and Path2D.Double should have final getPathIterator methods Reviewed-by: prr

6982632: closed/java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java fails Reviewed-by: prr

Merge

Merge

6522514: Extending Arc2D.Double and serializing the object causes InvalidClassException Reviewed-by: prr

7020955: No focus point adjustment for RadialGradientPaint Reviewed-by: prr

7036754: NaNs in stroked quadratics. Summary: Check for them and remove them. Reviewed-by: flar

7037091: sun/java2d/pipe/Test7027667.java test is not executed Reviewed-by: prr

7031011: fallbackfont testing failed on OEL 6. Reviewed-by: igor, jgodinez

6989724: font warnings in the build, native code Reviewed-by: bae, igor

Merge

Merge

7042040: Remove disk space sanity check Summary: Remove outdated disk space checks using df Reviewed-by: ohair, omajid

7026163: gzip tar files Reviewed-by: katleman

7041284: arm/ppc Missing launcher mapfiles prevent build Summary: Disable use of launcher mapfiles when cross-compiling Reviewed-by: ohair, ksrini

Added tag jdk7-b141 for changeset 3d44ee873b9c

Merge

7040779: Bump the HS21 build number to 12 Summary: Update the HS21 build number to 12 Reviewed-by: jcoomes

Merge

Merge

7042327: assert(opaq->outcnt() == 1 && opaq->in(1) == limit) Summary: Separate limit by Opaque2 node when calculating new limit for unrolled loop. Reviewed-by: never

7042070: Typo in Test6796786.java Summary: The test should compare with -0.0f. Reviewed-by: never, iveresov

7042052: Xcomp crash with PopSynchronousTest Reviewed-by: kvn, iveresov

5091921: Sign flip issues in loop optimizer Summary: Fix integer overflow problem in the code generated by loop optimizer. Reviewed-by: never

Merge

Merge

7041244: JSR 292: Server VM gets a SEGV running a JCK test Reviewed-by: iveresov, kvn, never

7041582: set_mode_flags isn't called without -Xmixed specified Reviewed-by: kvn, iveresov

7041603: standalone SA doesn't build after 7010849 Reviewed-by: dcubed

Merge

6796786: invalid FP identity transform - (a - b) -> b - a Reviewed-by: iveresov, twisti

7041100: The load in String.equals intrinsic executed before null check Summary: Remove control from loads in String.equals intrinsic and cast argument to not-null. Reviewed-by: never

7009361: JSR 292 Invalid value on stack on solaris-sparc with -Xcomp Reviewed-by: kvn, twisti

Merge

6552561: MaxRecursiveInlineLevel flag doesn't operate correctly Reviewed-by: kvn, never

7039652: Performance regression after 7004547 changes Summary: Use unrolled_count() to limit unrolling and use the stride check only for initial stride value. Reviewed-by: never

Merge

7036525: Disable alternative source mechanism for OPENJDK builds Summary: By default if OPENJDK=true is set then we don't look in the alt-src predefined location. The user can explicitly set HS_ALT_SRC_REL to the desired location in conjunction with OPENJDK=true, if they wish. Reviewed-by: jcoomes, kamg

7033669: JVM TI spec has to be changed to not contain URLS to the VM Spec Summary: Update JVMTI source files to remove hyperlinks and add full legal name Reviewed-by: acorn, dcubed, dholmes

Merge

7005503: Make GuaranteedSafepointInterval a diagnostic flag Reviewed-by: kamg, ysr

Merge

7036267: c2/arm: mark version number as experimental and disable on unsupported platforms Summary: Change call to Abstract_VM_Version::vm_info_string to VM_Version::vm_info_string so it cna be overridden by the arch specific VM_Version class Reviewed-by: bobv, phh

Merge

6728025: LinkResolver is missing some ResourceMarks Reviewed-by: dholmes, coleenp, ysr, kamg

7040450: G1: assert((_g1->evacuation_failed()) || (!_g1->obj_in_cs(obj))) failed: shouldn't still be in ... Summary: There is a race in the evac failure handling code that causes the condition the assert checks not to be true. The fix is to replace the too-strong assert with a more targeted one. Reviewed-by: johnc, ysr, jcoomes

7041501: NUMA: Expand the old gen more aggressively Summary: Expand the old gen in bigger increments Reviewed-by: jmasa

7040068: CMS: Possibly unsafe initialization of BlockOffsetArrayUseUnallocatedBlock Summary: BlockOffsetArrayUseUnallocatedBlock was intended to be turned off as part of BUG 6948538 but a code line in collectorPolicy.cpp actually kept it turned on. Reviewed-by: jwilhelm, ysr

Merge

Merge

7040485: Use transparent huge page on linux by default Summary: Turn on UseLargePages by default but try only HugeTLBFS method if it is not explicitly specified on the command line. Reviewed-by: ysr

7035144: G1: nightly failure: Non-dirty cards in region that should be dirty (failures still exist...) Summary: We should only undirty cards after we decide that they are not on a young region, not before. The fix also includes improvements to the verify_dirty_region() method which print out which cards were not found dirty. Reviewed-by: johnc, brutisso

7034139: G1: assert(Thread::current()->is_ConcurrentGC_thread()) failed: only a conc GC thread can call this. Summary: We were calling STS join and leave during a STW pause and we are not suppoesed to. I now only call those during concurrent phase. I also added stress code in the non-product builds to force an overflows (the condition that ws uncovering the bug) to make sure it does not happen again. Reviewed-by: johnc, brutisso

7040410: -Xloggc:<file> incorrectly enables TraceClassUnloading causing tracing on tty Summary: Don't enable TraceClassUnloading whne -Xloggc is specified. Reviewed-by: tonyp, ysr

Merge

7041410: 5/4 finish removing SOLARIS_7_OR_LATER from HotSpot Summary: Delete use of SOLARIS_7_OR_LATER from sparcWorks.make Reviewed-by: never

Merge

Merge

6986065: Rebrand exe/dll company names Summary: Fixed Windows exe/dll right-click properties. "Oracle Corporation" for company name in jdk7, but "Sun Microsystems, Inc." for jdk6. Reviewed-by: phh, acorn

Merge

7031385: incorrect register allocation in release_store_fence on linux x86 Summary: Since gcc 4.5 the inline assembly trying to use r register for an atomic 8-bit exchange and it leads to compilation error Reviewed-by: dsamersoff, dholmes Contributed-by: dbhole@redhat.com

7041156: gcc 4.6 doesn't recognise -export-dynamic option Summary: Since -export-dynamic is a linker option, the correct way to pass it is -Xlinker -export-dynamic Reviewed-by: dsamersoff, dholmes Contributed-by: omajid@redhat.com

7028172: 3/4 SA needs to adapt to Solaris libproc change made in 6748307 Summary: Support build and runtime configs of old and new interfaces as appropriate. Reviewed-by: acorn, never

7019808: build fails on Fedora 14: SELinux run-time check: execution of stack in libjvm.so Summary: executable flag is set in the elf header of libjvm.so during build, instruct ld to don't do it. Reviewed-by: acorn, phh

7039447: 2/1 java profiling is broken in build 139 (garbage in function name) Summary: The name in a deferred JVM/TI DynamicCodeGenerated event needs to be explicitly saved. Reviewed-by: acorn, never, dsamersoff, dholmes

Merge

7036747: 7017009 reappeared, problem with ElfStringTable Summary: Created new "new" operator for CHeapObj that allows malloc to fail without causing fatal error. Also replaced "HeapAllocate" with "os::malloc" in decoder code to allow decoder to handle low memory scenario. Reviewed-by: coleenp, dholmes

Added tag hs21-b11 for changeset de80080e77a6

Added tag jdk7-b141 for changeset dbc77e0dc173

Added tag jdk7-b141 for changeset 0f69dca4aa47

Added tag jdk7-b141 for changeset 5d86d0c7692e

Merge

Merge

Merge

Added tag jdk7-b140 for changeset c0c0f0374f67

Merge

6631003: Add hg tip changeset to build image Reviewed-by: mduigou

7039493: incorporating WPTG translation bug fixes Reviewed-by: yhuang

Merge

Merge

Added tag jdk7-b140 for changeset 3202e475f9d9

Merge

6631003: Add hg tip changeset to build image Reviewed-by: mduigou

Merge

Merge

Added tag jdk7-b140 for changeset 2c31217f748a

Merge

6631003: Add hg tip changeset to build image Reviewed-by: mduigou

Merge

Merge

Added tag jdk7-b140 for changeset 837037533544

Merge

6631003: Add hg tip changeset to build image Reviewed-by: mduigou

Merge

Merge

Merge

7040257: [pt_BR,fr] Print dialog has duplicate mnemonic key. Reviewed-by: psun

7040228: [zh_TW] extra (C) on cancel button on File Chooser dialog Reviewed-by: yhuang

Merge

Merge

7038803: [CCJK] Incorrect mnemonic key (0) is displayed on cancel button on messagedialog of JOptionPane Reviewed-by: yhuang

6501385: ColorChooser demo - two elemets have same mnemonic in it locale, GTK L&F Reviewed-by: yhuang

7036955: Japanese man pages in linux should be in utf-8 encoding Reviewed-by: ohair, mfang

Merge

7040803: regression: bugster fail to start Reviewed-by: mullan, weijun, ngthomas

Merge

Added tag jdk7-b140 for changeset adbb12180d75

6903609: Max memory of 896 may be too large for typical windows developer environment Reviewed-by: ksrini, katleman

Merge

7040096: Fix broken hg tip for 'make source' Reviewed-by: katleman

6631003: Add hg tip changeset to build image Reviewed-by: mduigou

Merge

7034259: [all] incorrect mnemonic keys in JCP automatic update advanced settings dialog. Reviewed-by: yhuang

Merge

7035843: [zh_CN, ja] JConsole mnemonic keys don't work Reviewed-by: ogino

Merge

Merge

7025070: man page localization broken in jdk7 Reviewed-by: mfang

6595663: Manifest on jars contain JavaBeans entries Reviewed-by: alanb, mchung

7038711: Fix CC_VER checks for compiler options, fix use of -Wno-clobber Reviewed-by: igor

Merge

Merge

7040777: Bump the HS21 build number to 11 Summary: Update the HS21 build number to 11 Reviewed-by: jcoomes

Merge

Merge

Merge

7037756: Deadlock in compiler thread similiar to 6789220 Summary: Avoid blocking in CompileBroker::compile_method_base() if the current thread holds the pending list lock. Reviewed-by: never, brutisso, ysr

7039089: G1: changeset for 7037276 broke heap verification, and related cleanups Summary: In G1 heap verification, we no longer scan perm to G1-collected heap refs as part of process_strong_roots() but rather in a separate explicit oop iteration over the perm gen. This preserves the original perm card-marks. Added a new assertion in younger_refs_iterate() to catch a simple subcase where the user may have forgotten a prior save_marks() call, as happened in the case of G1's attempt to iterate perm to G1 refs when verifying the heap before exit. The assert was deliberately weakened for ParNew+CMS and will be fixed for that combination in a future CR. Also made some (non-G1) cleanups related to code and comments obsoleted by the migration of Symbols to the native heap. Reviewed-by: iveresov, jmasa, tonyp

7037939: NUMA: Disable adaptive resizing if SHM large pages are used Summary: Make the NUMA allocator behave properly with SHM and ISM large pages. Reviewed-by: ysr

7037250: cscope.make database generation is silently broken Reviewed-by: stefank

Merge