Merge

6981922: DNS cache poisoning by untrusted applets Reviewed-by: chegar

6907662: System clipboard should ensure access restrictions Reviewed-by: alexp

6997851: Create NTLM AuthenticationCallBack class to avoid NTLM info leakage on client side Reviewed-by: michaelm

6994263: Untrusted code can replace JRE's XML DSig Transform or C14N algorithm implementations Reviewed-by: xuelei

6985453: Font.createFont may expose some system properties in exception text Reviewed-by: prr, hawtin

Merge

Merge

7029491: fix broken test file committed with CR 5045147. Summary: an incorrect file was committed with CR 5045147. This commit corrects that error and also applies minor review suggestions. Reviewed-by: alanb

Merge

7017446: (fs) Updates to file system API (3/2011) Reviewed-by: sherman

7028468: (fs) FileSystems.getDefault() fails when kernel micro version contains/ends non-numeric characters Reviewed-by: forax, chegar

7026184: (launcher) Regression: class with unicode name can't be launched by java. Reviewed-by: mchung, sherman

Merge

7028668: 3/4 improve diagnosibility and robustness of sun.tools.attach.WindowsVirtualMachine.openProcess() Summary: Add more info to OpenProcess default detail error message. Try a different technique when a Java process is attaching to itself. Reviewed-by: zgu, ohair, alanb

7022382: convert pack200 library code to use try-with-resources Reviewed-by: ksrini

5045147: Prevent insertion of null Key into empty TreeMap (and null element into TreeSet) when no Comparator is used. Prevent insertion of key of incorrect type into empty TreeMap and incorrect type element into TreeSet and incorrect type when Comparator is used. Reviewed-by: alanb, dl, mduigou

Merge

7028133: Specify serialVersionUID for RegularEnumSet and JumboEnumSet Reviewed-by: alanb, mduigou Contributed-by: Neil Richards <neil.richards@ngmr.net>

6796662: (fmt spec) Formatter spec on BigDecimal output should not reference Float a Summary: updated the spec doc Reviewed-by: alanb

7028422: regression: SKID miss-matching Summary: Do not override the previous setting for initial selection. Reviewed-by: mullan

7026898: DriverManager to now use CopyOnWriteArrayList Reviewed-by: alanb, briangoetz

7027910: Add basic cross-compilation support and add ARM/PPC to the known architectures in the open code Summary: Cross-compilation support Reviewed-by: ohair, andrew

6803681: RFE: Need new codeset converter for IBM Cp1364 Summary: forward port the Cp1364 Reviewed-by: alanb

Merge

Merge

7027897: Build support for client-VM only configurations Summary: Support builds for which only the client VM is required and/or available Reviewed-by: ohair, andrew

7022855: Export "PKIX" as the standard algorithm name of KeyManagerFactory Summary: export the existing "NewSunX509" algorithm implementation using the standard name "PKIX" Reviewed-by: weijun, wetmore

7025073: Stricter check on trust anchor makes VerifyCACerts.java test fail Summary: loosen the check for version 1 and 2 X.509 certificate Reviewed-by: mullan, weijun

7001933: Deadlock in java.lang.classloader.getPackage() Summary: Modified to not holding the "packages" lock when calling parent CL. Reviewed-by: dholmes, alanb

7026376: (dc) DatagramChannel created without specifying protocol family fails to join IPv4 group Reviewed-by: chegar

7014637: Improve behavior of EnumSet Iterator.remove() Reviewed-by: mduigou, alanb Contributed-by: Neil Richards <neil.richards@ngmr.net>

7027362: Project Coin: warn of throwing InterruptedException in AutoCloseable.close javadoc Reviewed-by: jjb

Merge

6686215: Some mutables not defensively copied when deserializing java.security.CodeSource & Timestamp objects Reviewed-by: mullan

7027288: (launcher) remove jkernel test from MiscTests Reviewed-by: mchung, herrick

7009794: misleading text in SSLHandshakeException exception message Summary: update the warning message Reviewed-by: weijun

6990848: JGSS/windows security code native code compiler warnings Reviewed-by: valeriep

7023613: (lc) Incorrect string returned by Locale.toString() with non-empty script field Reviewed-by: srl

7023416: (pack200) fix parfait issues Reviewed-by: jrose

7023363: URI("ftp", "[www.abc.com]", "/dir1/dir2", "query", "frag") should throw URISyntaxException Reviewed-by: alanb, michaelm

Merge

6986477: sun/security/mscapi/AccessKeyStore.sh test is failing on jdk7 Reviewed-by: valeriep

7026346: URLConnection.guessContentTypeFromStream does not support UTF-8 and UTF-32 xml streams with BOM Reviewed-by: alanb Contributed-by: Charles Lee <littlee@linux.vnet.ibm.com>

7024560: InetAddress.getLocalHost().getHostName() returns localhost for hostnames of length HOST_NAME_MAX Reviewed-by: alanb, michaelm

7016078: javax.net.ssl.SSLException: Received fatal alert: internal_error starting JDK 7 b126 Reviewed-by: valeriep

6960211: JavaScript engine allows creation of interface although methods not available Reviewed-by: jjh

Merge

6635776: Regression in jaxb tests with JDk6 U4 6741058: Move org/relaxng/datatype sources from jdk to jaxws workspace Reviewed-by: ohair, alanb

7020513: Add com.sun.xml.internal to the "package.access" property in $JAVA_HOME/lib/security/java.security Reviewed-by: ohair, alanb

7022370: Launcher ergonomics should provide simple default implementation Summary: Use a common, platform independent, implementation unless an architecture specific implementation exists Reviewed-by: ksrini, mchung, ohair, gbenson

Merge

6611830: UUID thread-safety and performance improvements Reviewed-by: mduigou, jjb, alanb, briangoetz, dholmes, peterjones Contributed-by: Daniel Aioanei <danielaioanei@google.com>

7023006: Reduce unnecessary thread activity in ForkJoinPool Reviewed-by: chegar, dholmes

6495521: (doc) ConcurrentSkipListMap links to web page NOT describing SkipList Summary: update link, and minor implementation comment in Exchanger Reviewed-by: chegar, mduigou

Merge

Merge

7027387: (tz) Support tzdata2011d Reviewed-by: okutsu

7021517: java.beans code comments have issues with HTML4 compliance Reviewed-by: rupashka

7027043: (doc) Confusing typo at java/beans/VetoableChangeSupport.java Reviewed-by: rupashka

7016150: 6246816 refers to the Laffy demo which is not present in the JDK 7 demo/jfc directory Reviewed-by: peterz

6464022: Memory leak in JOptionPane.createDialog Reviewed-by: alexp

Merge

Merge

7016131: JDK 7 b127: 8 crashes in native frame:awt_DrawingSurface_FreeDrawingSurfaceInfo+0xc on linux amd64 Reviewed-by: dcherepanov, art

7022931: GradientPaint class spec clarification: 7022931, 7016391, 7017246, 7019386 Reviewed-by: flar

7023019: Constructor of class java.awt.Component.FlipBufferStrategy throws unspecified IAE Reviewed-by: dcherepanov, art

Merge

7014528: ColorModel and SampleModel gotten from the same ImageTypeSpecifier instance can be not compatible Reviewed-by: jgodinez, prr

6989760: cmm native compiler warnings Reviewed-by: prr, ohair

7019861: Last scanline is skipped in pisces.Renderer. Summary: not skipping it anymore. Reviewed-by: flar

7027667: clipped aa rectangles are not drawn properly. Summary: Already fixed. This is just a regression test for it. Reviewed-by: prr

6710434: PIT: Reg test java/awt/Graphics2D/ClipPrimitivesTest.java fails in pit build 6u10_b26 Reviewed-by: flar, prr

7022280: Parfait reports Format string argument mismatch in /jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c Reviewed-by: jgodinez, prr

7020528: closed/java/awt/print/PageFormat/PageFormatFromAttributes.java failed Reviewed-by: igor, prr

6962082: merge back in lines from bad merge in CR 6501644 and open up a test Reviewed-by: igor, prr

7017324: Kerning crash in JDK 7 since ICU layout update Reviewed-by: igor, prr

Added tag jdk7-b135 for changeset 81eebf5a4f77

Merge

7031227: Bump the HS21 build number to 06 Summary: Update the HS21 build number to 06 Reviewed-by: jcoomes

Merge

Merge

7025628: Remove the temporary hack added for jdk modularization in hotspot Summary: Removed Reviewed-by: ohair, coleenp

6535709: interrupt of wait()ing thread isn't triggerring InterruptedException - test intwait3 Summary: only clear the interrupt state if we will report that it was set Reviewed-by: dcubed, alanb, phh, coleenp, dice

Merge

7029805: JSR 292 compiler/6991596/Test6991596.java fails in nightly Summary: Both JSR 292 compiler tests were moved with 6839872 to the jdk repository Reviewed-by: never

7008866: Missing loop predicate for loop with multiple entries Summary: Add predicates when loop head bytecode is parsed instead of when back branch bytecode is parsed. Reviewed-by: never

7027232: JSR 292: wrong numeric value returned by MH on solaris-sparc Reviewed-by: kvn, never

Merge

7030300: more nightly failures after statics in Class changes Reviewed-by: iveresov, jcoomes, dcubed

6962931: move interned strings out of the perm gen Reviewed-by: never, coleenp, ysr, jwilhelm

6962930: make the string table size configurable Reviewed-by: never, phh, stefank, kamg, dholmes, coleenp

7029509: nightly failures after static fields in Class Reviewed-by: kvn

7017732: move static fields into Class to prepare for perm gen removal Reviewed-by: kvn, coleenp, twisti, stefank

7028374: race in fix_oop_relocations for scavengeable nmethods Reviewed-by: kvn

Added tag hs21-b05 for changeset 0001aa6ce1bf

Added tag jdk7-b135 for changeset 0001aa6ce1bf

Merge

7030131: Update README-builds.html to cover changes introduced by SE-Embedded integration Reviewed-by: ohair

Added tag jdk7-b135 for changeset e9c5ee40c666

Added tag jdk7-b135 for changeset f75a1efb1412

Merge

Merge

Added tag jdk7-b134 for changeset fbf4a969ccba

Merge

Added tag jdk7-b134 for changeset 0cea4fe308ee

Merge

Added tag jdk7-b134 for changeset 74c6fa05df57

Merge

Added tag jdk7-b134 for changeset 0c806e137e3f

Merge

Merge

Merge

7020960: CurrencyNames_sr_RS.properties is missing. Reviewed-by: naoto

Merge

Merge

7019267: Currency Display Names are not localized into pt_BR. Reviewed-by: naoto

Merge

7025303: NLS: t13y fix for 7021691 Most log level words are not translated in java logging Reviewed-by: yhuang

7021693: [ja, zh_CN] jconsole throws exception and fail to start in ja and zh_CN locales Reviewed-by: ogino

7025267: NLS: t13y fix for 7021689 [ja] Notepad demo throws NPE Reviewed-by: ogino

7016542: NLS: obsolete resources in MsgAppletViewer.java should be removed Reviewed-by: igor

Merge

6998391: Serbian (Latin) locale support Reviewed-by: naoto

7029704: JFB: Refix JFB Custom Revision Version Build/Makefile changes Reviewed-by: mr, ohair

Added tag jdk7-b134 for changeset d7436373981b

Merge

7028846: Bump the HS21 build number to 05 Summary: Update the HS21 build number to 05 Reviewed-by: jcoomes

Merge

Merge

6668573: CMS: reference processing crash if ParallelCMSThreads > ParallelGCThreads Summary: Use _max_num_q = max(discovery_degree, processing_degree), and let balance_queues() redistribute from discovery_degree to processing_degree of queues. This should also allow a more dynamic and flexible parallelism policy in the future. Reviewed-by: jmasa, johnc

6896099: Integrate CMS heap ergo with default heap sizing ergo 6627787: CMS: JVM refuses to start up with -Xms16m -Xmx16m 7000125: CMS: Anti-monotone young gen sizing with respect to maximum whole heap size specification 7027529: CMS: retire CMSUseOldDefaults flag Summary: Simplify CMS heap sizing code, relying on ergonomic initial sizing consistent with other collectors for the most part, controlling only young gen sizing to rein in pause times. Make CMS young gen sizing default statically cpu-dependant. Remove inconsistencies wrt generation sizing and policy code, allowing for the fixing for 6627787 and 7000125. For 7027529, retire the flag CMSUseOldDefaults which had been introduced as a bridge from JDK 5 to JDK 6 a number of years ago. Reviewed-by: brutisso, poonam

Merge

6820066: Check that -XX:ParGCArrayScanChunk has a value larger than zero. Summary: Check that -XX:ParGCArrayScanChunk has a value larger than zero. Reviewed-by: johnc, jmasa, ysr

6987703: iCMS: Intermittent hang with gc/gctests/CallGC/CallGC01 and +ExplicitGCInvokesConcurrent Summary: Count enable_icms() and disable_icms() events so as to prevent inteference between concurrent calls, which can cause the iCMS thread to be left stranded in icms_wait() with an unserviced request and no young allocations to unwedge it. Reviewed-by: jcoomes, poonam

7023747: G1: too strict assert in RefineRecordRefsIntoCSCardTableEntryClosure::do_card_ptr in g1RemSet.cpp Summary: Made sure that the assert looks at ParallelGCThreads. Reviewed-by: stefank, tonyp, jwilhelm, johnc

7022943: G1: improve logging to avoid interleaved numbers Summary: Introduced buffered loggging to make sure that log lines are logged one line at a time Reviewed-by: stefank, johnc, dsamersoff

7018056: large pages not always enabled by default Reviewed-by: phh, kvn

7014923: G1: code cleanup Summary: Some G1 code cleanup. Reviewed-by: johnc, jcoomes, jwilhelm

Merge

7011865: JSR 292 CTW fails: !THREAD->is_Compiler_thread() failed: Can not load classes with the Compiler thre Reviewed-by: kvn, never

7028394: Newer AMD Processor Prefetch Defaults Summary: This new default has shown improvement across many workloads. Reviewed-by: kvn Contributed-by: tom.deneau@amd.com

7012648: move JSR 292 to package java.lang.invoke and adjust names Summary: package and class renaming only; delete unused methods and classes Reviewed-by: twisti

6839872: remove implementation inheritance from JSR 292 APIs Summary: consolidate runtime support in java.dyn.MethodHandleNatives; include transitional compatibility logic Reviewed-by: twisti

Merge

7026631: field _klass is incorrectly set for dual type of TypeAryPtr::OOPS Summary: add missing check this->dual() != TypeAryPtr::OOPS into TypeAryPtr::klass(). Reviewed-by: never

7025742: Can not use CodeCache::unallocated_capacity() with fragmented CodeCache Summary: Use largest_free_block() instead of unallocated_capacity(). Reviewed-by: iveresov, never, ysr

6965570: assert(!needs_patching && x->is_loaded(),"how do we know it's volatile if it's not loaded") Reviewed-by: iveresov

6589823: Error: meet not symmetric Summary: arrays pointers meet must fall to bottom if exact array klasses in upper lattice are not equal or super klass is exact. Reviewed-by: never

Merge

7024866: # assert(limit == NULL || limit <= nm->code_end()) failed: in bounds Reviewed-by: kvn, iveresov

7020403: Add AdvancedCompilationPolicy for tiered Summary: This implements adaptive tiered compilation policy. Reviewed-by: kvn, never

Merge

Merge

7011490: Wrong computation results in Test6880034 Summary: incorrect handling of c2i deoptimization on little endian architectures Reviewed-by: never

7019165: Incorrect symbols in pstack output after SymbolTable changes Summary: And out lsb which is set for symbols in constant pool slots to distinguish them from strings Reviewed-by: phh, dholmes, never, dcubed

Merge

7024970: 2/3 assert(ServiceThread::is_service_thread(Thread::current())) failed: Service thread must post enqueue Summary: Change nmethod_lock() to also prevent zombification of the nmethod. CompiledMethodUnload events also need to lock the nmethod. Clean ups in nmethod::make_not_entrant_or_zombie() Reviewed-by: dholmes, kamg, never, dsamersoff, ysr, coleenp, acorn

7024234: 2/3 jvmti tests fail assert(!_oops_are_stale) failed: oops are stale on Win-AMD64 Summary: Move initialization of the '_instance' field to avoid race with ServiceThread start. Reviewed-by: dholmes, kamg, never, dsamersoff, ysr, coleenp, acorn

Merge

7023931: PcDescCache::find_pc_desc should not write _last_pc_desc Summary: Remove _last_pc_desc and use pcdescs[0] instead. Reviewed-by: dcubed, coleenp, ysr

7025485: leverage shared x86-only deoptimization code Summary: removed an ifdef IA32 around harmless code useful for some ports Reviewed-by: chrisphi, never

Merge

7024584: Symbol printouts shouldnt be under PrintGCDetails Summary: Put symbol printing under Verbose and WizardMode so you can get this information if you really want it. Reviewed-by: phh, stefank, never, dholmes, jcoomes

Merge

6845426: non-static <clinit> method with no args is called during the class initialization process Summary: Only call <clinit> with ACC_STATIC for classfiles with version > 50 Reviewed-by: acorn, dholmes, coleenp

7021653: Parfait issue in hotspot/src/share/vm/oops/methodDataOops.hpp Summary: Fix compilation error(s) Reviewed-by: kvn, phh, jcoomes, dholmes

6512830: Error: assert(tag_at(which).is_unresolved_klass(), "Corrupted constant pool") Summary: Redefine classes copies the constant pool while the constant pool may be resolving strings or classes Reviewed-by: dcubed, dsamersoff, acorn

7022999: Can't build with FORCE_TIERED=0 Summary: Put UseFastLocking test under #ifdef COMPILER1 Reviewed-by: kvn, phh, never, dcubed

Added tag hs21-b04 for changeset 8f90284bf3fa

Added tag jdk7-b134 for changeset 3cb740be56d2

Merge

6896934: README: Document how the drop source bundles work for jaxp/jaxws 6896978: README: Updates to openjdk README-builds.html 6903517: README: OpenJDK additions needed - cygwin issues Reviewed-by: dholmes

Added tag jdk7-b134 for changeset 6baee4c33881

Added tag jdk7-b134 for changeset def8e16dd237

Merge

Merge

Merge

Merge

7025324: NLS: t13y fix for 7022005 [ja,zh_CN] javadoc, part of navigation bar in generated html are not translated Reviewed-by: yhuang, ogino, jennyh

Merge

6980021: javac should document @file command line option Reviewed-by: mcimadamore

Merge

7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes Summary: Disallow diamond on anonymous innner class creation expression (as per JSR 334's EDR) Reviewed-by: jjg

7024568: Very long method resolution causing OOM error Summary: Resolve.findMethod scans same receiver type more than once in certain inheritance graphs Reviewed-by: jjg Contributed-by: jan.lahoda@oracle.com

6964914: javadoc does not output number of warnings using user written doclet Reviewed-by: bpatel

6227454: package.html and overview.html may not be read fully Reviewed-by: bpatel

6866185: Util.getPackageSourcePath should use lastIndexOf not indexOf and related cleanup Reviewed-by: bpatel

6966736: javac verbose output is inconsistent Reviewed-by: mcimadamore

7024212: TestWarnErrorCount fails Summary: TestWarnErrorCount should be executed with -Xlint:all,-path to avoid spurious failures Reviewed-by: jjg

7022054: Invalid compiler error on covariant overriding methods with the same erasure Summary: Rules for method clash use notion of subsignature, which is sometimes too strict and incompatible with JDK 6 Reviewed-by: jjg

7023703: Valid code doesn't compile Summary: leftovers cause problems when analyzing loops in Flow.java Reviewed-by: jjg

7023233: False positive for -Xlint:try with nested try with resources blocks Summary: Wrong lint warning issued about unused resource when nested try-with-resource blocks are found Reviewed-by: jjg

6639645: Modeling type implementing missing interfaces Reviewed-by: darcy, mcimadamore

6986892: confusing warning given after errors in annotation processing Reviewed-by: darcy

6986895: compiler gives misleading message for no input files Reviewed-by: darcy

6541876: "Enclosing Instance" error new in 1.6 Summary: unqualified 'this' should not be selected in a qualified super() call in a default constructor Reviewed-by: jjg

7021183: 269: assertion failure getting enclosing element of an undefined name Reviewed-by: mcimadamore

7022711: compiler crash in try-with-resources Reviewed-by: mcimadamore

7022741: warning counts are wrong after anno processing Reviewed-by: mcimadamore

7022337: repeated warnings about bootclasspath not set Reviewed-by: mcimadamore

7015715: lub gets stuck on type with complex supertype Summary: lub should not scan supertypes unnecessarily Reviewed-by: jjg, dlsmith

7015430: Incorrect thrown type determined for unchecked invocations Summary: Thrown types do not get updated after 15.12.2.8, and do not get erased as per 15.12.2.6 Reviewed-by: jjg, dlsmith

7022310: test/tools/javac/diags/Example: args added twice Reviewed-by: mcimadamore

7021650: fix Context issues Reviewed-by: mcimadamore

7018753: tools/javac/varargs/warning/Warn5.java times out on slow machines Summary: Use a single file manager for all JavacTasks Reviewed-by: jjg, mcimadamore

Merge

7019631: issues in test headers in b130 Summary: fix to test headers not containing correct bug ID Reviewed-by: jjg

7020657: Javac rejects a fairly common idiom with raw override and interfaces Summary: name clash should not be reported if subinterface/implementing class resolves the clash by defining common overrider Reviewed-by: jjg

Added tag jdk7-b133 for changeset 527e04a21c75

Merge

Merge

7025412: make381 issues with quotes in jdk/make/docs/Makefile and other places Reviewed-by: mchung

Added tag jdk7-b133 for changeset f3c2826383e4

Merge

Merge

Merge

7025412: make381 issues with quotes in jdk/make/docs/Makefile and other places Reviewed-by: mchung

Merge

Merge

7023289: jaxp 1.4.5 development jdk7 2nd integration Reviewed-by: joehw, mchung, alanb

Added tag jdk7-b133 for changeset 97a72738edc8

Merge

Added tag jdk7-b133 for changeset 1a8d894467d8

Merge

7027923: Disable VS2003 use in preparation for all VS2003 make logic removal Reviewed-by: prr

7022473: JDK7 still runs /etc/prtconf to find memory size Reviewed-by: ohair

6973319: incorrect spec version in jdk 7 rt.jar manifest Reviewed-by: ohair

Merge

6710813: SwingSet2 source display tabs do not work since JDK 7 b20 6685150: make/mkdemo/jpda/Makefile creates jpda.jar and src.zip instead of examples.jar Reviewed-by: prr

Merge

Merge

6908562: JFB Custom Revision Version Build/Makefile changes Reviewed-by: ohair, ksrini, katleman

7025412: make381 issues with quotes in jdk/make/docs/Makefile and other places Reviewed-by: mchung, herrick

7026228: Remove make/modules and make/common/Modules.gmk Reviewed-by: alanb, ohair

7025631: Remove the modules build support from jdk 7 Reviewed-by: alanb, ohair

Merge

Merge

7025468: Tests using diamond with anonymous inner classes needs to be reverted Reviewed-by: dholmes, forax

Merge