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