Merge

Merge

6963489: ZDI-CAN-803: Sun JRE ICC Profile Device Information Tag Remote Code Execution Vulnerability Reviewed-by: prr

Merge

6926623: Thread clone issues Reviewed-by: hawtin

6963023: ZDI-CAN-809: Sun JRE JPEGImageWriter.writeImage Remote Code Execution Vulnerability Reviewed-by: prr

Merge

Merge

6938813: Swing mutable statics Reviewed-by: peterz, alexp

6925710: IndexColorModel.finalize can be made to double free Reviewed-by: igor, prr, hawtin

6958060: Malformed AP-REQ crashes acceptor side Reviewed-by: valeriep, xuelei

6957564: Disclosure of DNS server IP address Reviewed-by: xuelei, chegar

Merge

Merge

6914943: Implement final TLS renegotiation fix Summary: RFC 5746 implementation Reviewed-by: wetmore, weijun

6987154: HTML link to serialization guide is broken Reviewed-by: skannan

6990639: Fix for #6975829 breaks build Summary: define MIN2 micro Reviewed-by: alanb

Merge

6989116: (verifier) compiler warning messages Reviewed-by: kamg, ohair

6975829: Perf. of gzip in existing JDKs is too slower than in 1.3.1 Summary: Improved memory/buffer handling in Inflater.c Reviewed-by: alanb

6989466: Miscellaneous compiler warnings in java/lang, java/util, java/io, sun/misc native code Reviewed-by: andrew, mchung, ohair

6989903: (process) test/java/lang/ProcessBuilder/Basic.java failing with "Bad file number" (sol) Reviewed-by: ohair, chegar

6917323: serializable classes in java.dyn do not specify serialVersionUIDs Reviewed-by: jrose

6988317: RowSetProvider.newFactory() may throw unspecified exception Reviewed-by: darcy

6988310: SyncFactory.setLogger(Logger,Level) requires unspecified security permission Reviewed-by: darcy

6987116: (so) test/java/nio/channels/SocketChannel/VectorIO.java failed on Solaris 11 Reviewed-by: forax

Merge

6992272: I18N: Locale.getDisplayName() and toString() return empty if just script is set Reviewed-by: srl Contributed-by: y.umaoka@gmail.com

Merge

6638110: (tz) TimeZone.getDisplayName(...) spec is inconsistent with implementation for unavailable locales Reviewed-by: peytoia

6991013: Serialized form for java.util.Locale contains typos Reviewed-by: peytoia

6575419: Solaris : XSetICFoucs is not called with Java application at appropriate timing Reviewed-by: okutsu

6986385: JLayer should implement accessible interface Reviewed-by: rupashka

6984643: Unable to instantiate JFileChooser with a minimal BasicL&F descendant installed Reviewed-by: alexp

6603635: links to tutorials broken in JTable API doc Reviewed-by: alexp

6989440: tomcat test from dacapo benchmark fails with ConcurrentModificationException Reviewed-by: okutsu Contributed-by: y.umaoka@gmail.com

6970930: RuleBasedCollator.compare(String,null) throws IAE (should be NPE) Reviewed-by: okutsu

6986335: 10 regtest failures (test/javax/sound/midi/Gervil) due AudioFloatConverter.PCM_FLOAT not found Reviewed-by: dav

6984047: sound sources needs vendor rebranding changes (jdk7 only) Reviewed-by: ohair

6979793: closed/javax/swing/JFileChooser/6396844/TwentyThousandTest fails due FileNotFound exc. Reviewed-by: malenkov

Merge

Merge

6838089: java.awt.Window.setOpacity() doesn't throw IllegalComponentStateException for two-display conf Reviewed-by: art, anthony

6979568: Test failure: test\closed\java\awt\Component\VisibleHwInLwContTest\VisibleHwInLwContTest.html Summary: Extend iteration to this container in isRecursivelyVisibleUpToHeavyweightContainer() Reviewed-by: art, dcherepanov

6991992: Need to forward-port AWT's part of the fix for 6691674 Reviewed-by: art

6989721: awt native code compiler warnings Reviewed-by: yan, uta

6973199: java/awt/Robot/RobotWheelTest/RobotWheelTest.html failed on JDK7 b102 bug passed on b101 Reviewed-by: art, yan

6990352: SplashScreen.getSplashScreen() does not return null for implicitly closed splash screen Summary: Mark the splash screen closed when it happens implicitly Reviewed-by: art, dcherepanov

6895647: Frame may jump to an unpredicted location upon entering the non-opaque mode on X11 Summary: Make sure the size hints are set before mapping the window on the screen Reviewed-by: art, dcherepanov

6979541: closed/javax/swing/plaf/basic/AWTEventListenerLeak/AWTEventListenerLeak.java fails Reviewed-by: anthony, ant

6828273: javax/swing/system/6799345/TestShutdown.java test fails with RuntimeException. Reviewed-by: anthony, dcherepanov

6829546: Modal dialog causes underlying parent JFrame to be set to "Always on top". Reviewed-by: anthony, dcherepanov

Merge

6804454: RFE: Provide a way to control the printing dpi resolution from MSIE browser print. See also 6801859 Reviewed-by: igor, prr

6984033: imageio vendor references need to change (jdk7 only) Reviewed-by: prr, ohair

6773022: java.awt.image.SampleModel.getDataElements() does't throw ArrayIndexOutOfBoundsEx for Integer.MAX_V Reviewed-by: igor, prr

6725821: Compiler warnings in medialib code Reviewed-by: igor, prr

6975884: sun/java2d/SunGraphics2D/DrawImageBilinear.java failed Reviewed-by: prr

6853488: REGRESSION : A black background is seen for a transparent animated gif image for splash screen Reviewed-by: igor, prr

6976076: sun/java2d/pipe/MutableColorTest/MutableColorTest.java failed Reviewed-by: igor, prr

Added tag jdk7-b115 for changeset d4a3f4d26885

Merge

Added tag jdk7-b115 for changeset 6c5fa35fa077

Added tag jdk7-b115 for changeset 78cff985750d

Added tag jdk7-b115 for changeset 9cb24917216b

Merge

Merge

Added tag jdk7-b114 for changeset 114c3761ebd8

Merge

Added tag jdk7-b114 for changeset 645f70db28dc

Merge

Added tag jdk7-b114 for changeset 83c0366b459c

Merge

Added tag jdk7-b114 for changeset a8770885b5cb

Merge

Merge

Merge

Merge

Merge

Merge

6982499: ant detection is fragile on windows. especially using cygwin Reviewed-by: ohair

6982774: HOTSPOT_IMPORT_PATH detection does not work as expected Reviewed-by: herrick, ohair

Merge

6981436: Variable gets hidden if Defs-javadoc is included Reviewed-by: ohair

Merge

6976516: Add support for compiling deploy ws without compiling j2se Reviewed-by: herrick, ohair

Added tag jdk7-b114 for changeset 59be7b5071f2

Merge

Merge

6992267: Bump the HS20 build number to 02 Summary: Update the HS20 build number to 02 Reviewed-by: jcoomes

Merge

Merge

Merge

6991211: assert failure on sparc: "can not have caller-save register operands at calls" Summary: fixes sparc only assert failure following 6972540 Reviewed-by: never

Merge

6987555: JSR 292 unboxing to a boolean value fails on big-endian SPARC Reviewed-by: never, jrose

6991512: G1 barriers fail with 64bit C1 Summary: Fix compare-and-swap intrinsic problem with G1 post-barriers and issue with branch ranges in G1 stubs on sparc Reviewed-by: never, kvn

6991065: missed a review comment in 6829194 Reviewed-by: kvn

6829194: JSR 292 needs to support compressed oops Reviewed-by: kvn, jrose

6990549: Zero and Shark fixes after 6978355 and 6953144 Reviewed-by: twisti Contributed-by: Gary Benson <gbenson@redhat.com>

6980792: Crash "exception happened outside interpreter, nmethods and vtable stubs (1)" Reviewed-by: kvn

Merge

6980838: G1: guarantee(false) failed: thread has an unexpected active value in its SATB queue Summary: Under certain circumstances a safepoint could happen between a JavaThread object being created and that object being added to the Java threads list. This could cause the active field of that thread's SATB queue to get out-of-sync with respect to the other Java threads. The solution is to activate the SATB queue, when necessary, before adding the thread to the Java threads list, not when the JavaThread object is created. The changeset also includes a small fix to rename the surrogate locker thread from "Surrogate Locker Thread (CMS)" to "Surrogate Locker Thread (Concurrent GC)" since it's also used in G1. Reviewed-by: iveresov, ysr, johnc, jcoomes

Merge

6983311: G1: LoopTest hangs when run with -XX:+ExplicitInvokesConcurrent Summary: Clear the concurrent marking "in progress" flag while the FullGCCount_lock is held. This avoids a race that can cause back to back System.gc() calls, when ExplicitGCInvokesConcurrent is enabled, to fail to initiate a marking cycle causing the requesting thread to hang. Reviewed-by: tonyp, ysr

6794422: Perm gen expansion policy for concurrent collectors Summary: Concurrent collectors should expand the perm gen without a full STW GC, but possibly by triggering a concurrent collection. Temporary band-aid for G1 where no concurrent collection is kicked off since the perm gen is not collected concurrently. Reviewed-by: johnc

6988678: fatal error deadlock handling was unintentionally disabled Reviewed-by: ysr

6692906: CMS: parallel concurrent marking may be prone to hanging or stalling mutators for periods of time Summary: Inserted missing yield(check)s in closures used during the work-stealing phase of parallel concurrent marking, a missing synchronous yield-request in the cms perm gen allocation path, and a terminator-terminator for the offer_termination invocation that monitors the yield status of the concurrent marking task. Elaborated some documentation comments and made some task queue termination loop flags configurable at start-up to aid debugging in the field. Reviewed-by: jmasa, johnc, poonam

6423256: GC stacks should use a better data structure 6942771: SEGV in ParScanThreadState::take_from_overflow_stack Reviewed-by: apetrusenko, ysr, pbk

6941395: G1: Use only lock-free versions of region stack push() and pop() Summary: Re-enable use of the lock-free versions of region stack push() and pop() by recording aborted regions in a thread-local structure, which are then processed when scanning of the region stack restarts. The previous locking versions of these routines are retained for diagnostic purposes. Reviewed-by: tonyp, ysr

6983296: build sanity checks for jdk7 should require SS12u1 Reviewed-by: ohair

6984287: Regularize how GC parallel workers are specified. Summary: Associate number of GC workers with the workgang as opposed to the task. Reviewed-by: johnc, ysr

Merge

6989736: fix mapfile warnings on solaris Reviewed-by: kvn, iveresov, jcoomes

6988018: dtrace/hotspot/MethodInvocation/MethodInvocation002 crashes with client compiler Reviewed-by: iveresov, kvn, kamg

6979458: VM crashes when -XX:ObjectAlignmentInBytes is too big Summary: Set upper limit 256 for ObjectAlignmentInBytes value. Reviewed-by: never, iveresov

6989368: Regression in scimark2.MonteCarlo in jdk7_b112 on Linux Summary: Fix ciMethod::instructions_size() to return correct value Reviewed-by: kvn, twisti

6968348: Byteswapped memory access can point to wrong location after JIT Reviewed-by: twisti, kvn, iveresov

6916062: assert(_inserts <= _insert_limit,"hash table overflow") in NodeHash::hash_insert Summary: Missing check for not empty worklist when puting memory node back on worklist and expecting address type update. Reviewed-by: never

6988346: 6986046 breaks tiered Summary: adjusted profiling code generation to use the new ValueStack implementation; lowered optimization level for c1_LinearScan.cpp on solaris x64. Reviewed-by: kvn, never