Merge

Merge

6939780: add a warning to detect diamond sites Summary: added hidden compiler flag '-XDfindDiamond' to detect 'diamondifiable' sites Reviewed-by: jjg

6996415: Override bridges causes compiler-generated code to end up with synthetic infinite loop Summary: temporarily disable fix for override bridges (6337171) Reviewed-by: jjg

6996626: Scope fix issues for ImportScope Reviewed-by: darcy

6994608: javah no longer accepts parameter files as input Reviewed-by: mcimadamore

6993304: JavacTrees.getAttrContext not updated to Tree.Kind.{ANNOTATION_TYPE,ENUM,INTERFACE} Reviewed-by: mcimadamore

6994946: option to specify only syntax errors as unrecoverable Reviewed-by: darcy, mcimadamore

6460352: Reintroduce Scope.dble Reviewed-by: mcimadamore, jjg Contributed-by: per.bothner@oracle.com

6949587: rename "DisjointType" to "DisjunctType" Reviewed-by: mcimadamore

6993301: catch parameters do not have correct kind (i.e. ElementKind.EXCEPTION_PARAMETER) Reviewed-by: mcimadamore

6987760: remove 308 support from JDK7 Reviewed-by: darcy, mcimadamore

6551367: javadoc throws ClassCastException when an @link tries to reference constructor. Reviewed-by: jjg, mcimadamore

Added tag jdk7-b117 for changeset 0c40f3078aa3

Merge

Added tag jdk7-b117 for changeset 4415519b35e2

Merge

Added tag jdk7-b117 for changeset be017e4765f7

Merge

Merge

Merge

6996740: Yet more breakage caused by 6891766 Summary: Restore com.sun.corba.se.simpl.io.IIOPInputStream that 6891766 nuked in error Reviewed-by: asaha

6996356: Changes for 6891766 break build Summary: JPRT build passed Reviewed-by: alanb

Merge

6891766: Vulnerabilities in use of reflection in CORBA Reviewed-by: hawtin

Added tag jdk7-b117 for changeset 984109266a3d

Merge

Merge

Merge

6982752: dynamic languages need to decorate types with runtime information Summary: Add ClassValue Reviewed-by: twisti

6953246: JSR 292 should support SAM conversion Summary: Conversion function MethodHandles.asInstance; initial slow implementation based on Proxy. Reviewed-by: twisti

6980096: JSR 292 reflective lookup should throw checked exceptions Summary: Make NoAccessException be a checked exception. Also remove JavaMethodHandle. Reviewed-by: twisti

6964498: JSR 292 invokedynamic sites need local bootstrap methods Summary: Add JVM_CONSTANT_InvokeDynamic records to constant pool to determine per-instruction BSMs; add MethodHandleProvider. Reviewed-by: twisti

Merge

6997928: LocaleCategory test fails with b118 PIT Reviewed-by: sherman

Merge

6945529: Apply fix for CR 6921001 to platform-specific java.security configuration files Reviewed-by: mullan

Merge

6431343: (dc) DatagramChannel may not report its local address correctly after connect or disconnect Reviewed-by: chegar

6993126: (aio) remove AsynchronousDatagramChannel Reviewed-by: chegar

6916074: Add support for TLS 1.2 6985179: To support Server Name Indication extension for JSSE client Summary: Introduces the algorithm constraints to support signature and hash algorithm selection. Includes contributions from wetmore and weijung. Reviewed-by: wetmore, weijun

6994413: JDK_GetVersionInfo0 only expects a two digit build number Reviewed-by: dholmes

6995674: (launcher) make of jli fails on windows if directory exists Reviewed-by: darcy, ohair

6792180: Enhance to reject weak algorithms or conform to crypto recommendations Reviewed-by: mullan, weijun, wetmore

4873188: Support TLS 1.1 Reviewed-by: wetmore, weijun

6984037: jmx/management rebranding vendor changes needed Reviewed-by: ohair

6950546: "ktab -d name etype" to "ktab -d name [-e etype] [kvno | all | old]" 6984764: kerberos fails if service side keytab is generated using JDK ktab Reviewed-by: valeriep

Merge

Merge

6993206: Removing non-functional tests. Reviewed-by: mchung

Merge

Merge

6966692: defaultReadObject can set a field multiple times Reviewed-by: hawtin

6559775: Race allows defaultReadObject to be invoked instead of readFields during deserialization Reviewed-by: hawtin

6541462: outdated specification for CCC 6339875 Summary: Add documentation to java.lang.ClassLoader.defineClass() Reviewed-by: dcubed, darcy

6989469: (launcher) compiler warnings in jli native code Reviewed-by: darcy, ohair, sherman

6994079: PlainSocketImpl should close the socket if it fails Reviewed-by: alanb

6985460: PlatformLogger throws ArrayStoreException when j.u.logging is initialized Reviewed-by: dholmes

6816049: (bf) MappedByteBuffer.force() method does not flush data correctly Reviewed-by: chegar

6947677: InetAddress.isReachable() throws "java.net.SocketException:Invalid argument" on Linux if run as root Reviewed-by: alanb

6992859: InetAddressCachePolicy.setIfNotSet() fails Reviewed-by: michaelm

6993490: SocketTimeoutException on HTTP keep-alive connections Reviewed-by: michaelm

6993267: TEST_BUG: java/nio/file/Path/InterruptCopy.java fails intermittently (win) Reviewed-by: forax

6992121: StringBuilder.ensureCapacity(int minCap) throws OutOfMemoryError with minCap=Integer.MIN_VALUE Reviewed-by: dholmes, alanb

6992968: test/java/lang/management/MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh should not hang Reviewed-by: alanb, dholmes

Merge

6989111: Incorrect default locale for New Zealand 6990452: Provide system properties for the user specified script 6992312: Currency becomes XXX if do not specify user.country.format Reviewed-by: okutsu

Merge

6950553: Applet: IE process crash in OLE32.DLL when playing a sound Reviewed-by: poonam

6432566: Replace usage of StringBuffer with StringBuilder in Swing Reviewed-by: malenkov

6996686: (tz) Support tzdata2010o Reviewed-by: okutsu

6659894: JDialog instance returns unexpected GraphicsConfiguration Reviewed-by: alexp

6735286: javax.swing.DefaultTableCellRender.getTableCellRendererComponent() doesn't allow passing null Tables Reviewed-by: alexp

6632810: javax.swing.plaf.basic.BasicScrollPaneUI.getBaseline(JComponent, int, int) doesn't throw NPE and IAE Reviewed-by: alexp

6816582: WindowsFileChooserUI throws NullPointer when awt.useSystemAAFontSettings=false Reviewed-by: uta

6993339: Bug4168625Test.java fails Reviewed-by: peytoia

6993140: protected constructor in javax.swing.plaf.synth.SynthTabbedPaneUI.SynthTabbedPaneUI is needed Reviewed-by: rupashka

4358979: javax.swing.border should have a DashedBorder Reviewed-by: flar, alexp

6989617: Enable JComponent to control repaintings of its children Reviewed-by: rupashka

6867515: Reduce impact of D3D initializion on startup time 6891435: Improve D3D preloading 6946559: AWTToolKit thread crashes in JNU_GetEnv 6987967: D3D preloading thread should initialize COM Reviewed-by: igor, art, uta

6991380: (cal) Calendar.cachedLocaleData should be transitioned from Hashtable to ConcurrentHashMap 6560965: [Fmt-Da] defaultCenturyStart In SimpleDateFormat should be protected 6560980: [Fmt-Da] DateFormatSymbols.cacheLookup doesn't update cache correctly. Reviewed-by: naoto, peytoia

Merge

Merge

6659228: GridBagConstraints API typo - 'ComponentOrienation' (missing t) 6210739: Need spec clarification of Scrollbar set/getVisibleAmount() Reviewed-by: anthony

Merge

6670881: Phantom lines appear when rendering polygons & ellipses with antialiasing OFF Reviewed-by: prr, bae

6967434: Round joins/caps of scaled up lines have poor quality. Summary: eliminated flattening from the rendering engine. Reviewed-by: flar

6663447: D3D: excessive surface data replacements Reviewed-by: prr, art

Merge

Merge

4225362: localized DateFormatSymbols for fr_FR is wrong Reviewed-by: yhuang, peytoia

Added tag jdk7-b117 for changeset 42a9e115bd6f

Merge

Merge

Merge

6996136: VM crash in src/share/vm/runtime/virtualspace.cpp:424 Summary: Turn CDS off if compressed oops is on Reviewed-by: ysr, kvn, jcoomes, phh

Merge

6995045: assert(!gch->incremental_collection_failed()) failed: Error, defNewGeneration.cpp:827 Summary: Sharpened an assert, introduced in 6896603, that intended to check that the incremental_collection_failed() predicate on the heap was being reset "soon enough". Reviewed-by: jmasa

6896603: CMS/GCH: collection_attempt_is_safe() ergo should use more recent data Summary: Deprecated HandlePromotionFailure, removing the ability to turn off that feature, did away with one epoch look-ahead when deciding if a scavenge is likely to fail, relying on current data. Reviewed-by: jmasa, johnc, poonam

6992998: CMSWaitDuration=0 causes hangs with +ExplicitGCInvokesConcurrent Summary: Closed a timing hole during which concurrent full gc requests can be missed. The hole can increase the latency of the response to a full gc request by up to the value of CMSWaitDuration. If CMSWaitDuration=0 is, as currently, interpreted as an unbounded wait, suitable in certain tuning scenarios, the application can potentially hang. Made two obscure tunables, including CMSWaitDuration, manageable. Reviewed-by: jcoomes, tonyp

6991377: G1: race between concurrent refinement and humongous object allocation Summary: There is a race between the concurrent refinement threads and the humongous object allocation that can cause the concurrent refinement threads to corrupt the part of the BOT that it is being initialized by the humongous object allocation operation. The solution is to do the humongous object allocation in careful steps to ensure that the concurrent refinement threads always have a consistent view over the BOT, region contents, and top. The fix includes some very minor tidying up in sparsePRT. Reviewed-by: jcoomes, johnc, ysr

6988458: G1: assert(mr.end() <= _cm->finger()) failed: otherwise the region shouldn't be on the stack Summary: The changes from 6941395 did not clear the CMTask::_aborted_region fields when concurrent marking aborted because of overflow. As a result, the next time around we could see a memory region whose start address was above the global finger and the assertion tripped. Moved the clearing of the aborted regions to ConcurrentMark::clear_marking_state, which is executed on all of the exit paths. Reviewed-by: tonyp, ysr, jmasa

6992189: G1: inconsistent base used in sparse rem set iterator Summary: The remembered set iterator for sparse tables incorrectly assumes that index 0 corresponds to the bottom of the heap, not address 0 as it is the case. Reviewed-by: ysr, jmasa

6990359: G1: don't push a stolen entry on the taskqueue, deal with it directly Summary: When an entry is stolen, don't push it on the task queue but process it directly. Reviewed-by: iveresov, ysr, jcoomes

Merge

6891959: HotSpot should not throw ClassFormatError if a class has a field with '>' and/or '<' in its name Summary: Class file parser needs to look for and disallow '[' in names. Reviewed-by: coleenp, never

Merge

Merge

6988353: refactor contended sync subsystem Summary: reduce complexity by factoring synchronizer.cpp Reviewed-by: dholmes, never, coleenp

6991315: RedefineClasses fails with java.lang.VerifyError Summary: Repair stackmap table attribute when relocating bytecode Reviewed-by: acorn, never

Merge

6989669: Coops: -Xshare:dump causes crash Summary: Temporarily fix to disable compressed oops with CDS Reviewed-by: dholmes, twisti, kvn, never