Merge

6514993: (prefs)prefs should use java.util.ServiceLoader to lookup service providers Reviewed-by: iris Contributed-by: xueming.shen@sun.com

6546113: (bf) CharSequence.slice() on wrapped CharSequence doesn't start at buffer position Reviewed-by: iris Contributed-by: roman.kennke@aicas.com

6628575: (fc) lock/tryLock methods do not work with NFS servers that limit lock range to max file size Reviewed-by: sherman

6644607: (ch) test/java/nio/channels/SocketChannel/Connect.java throws UnknownHostException Reviewed-by: chegar

6448457: (ch) Channels.newOutputStream().write() does not write all data Reviewed-by: iris, sherman

6625725: (coll) modCount should not be volatile Reviewed-by: dholmes

6583872: (coll) Direct uninformed users away from Vector/Hashtable Reviewed-by: dholmes

6633113: test/java/util/concurrent/SynchronousQueue/Fairness.java fails intermittently Reviewed-by: dholmes

6625723: Excessive ThreadLocal storage used by ReentrantReadWriteLock Reviewed-by: dholmes Contributed-by: Doug Lea <dl@cs.oswego.edu>

6620549: ExecutorService#shutdown should clearly state that it does not block Reviewed-by: dholmes Contributed-by: Doug Lea <dl@cs.oswego.edu>

6609775: Reduce context switches in DelayQueue due to signalAll Reviewed-by: alanb Contributed-by: Doug Lea <dl@cs.oswego.edu>

6602600: Fast removal of cancelled scheduled thread pool tasks Reviewed-by: alanb Contributed-by: Doug Lea <dl@cs.oswego.edu>

6612102: (coll) IdentityHashMap.iterator().remove() might decrement size twice Reviewed-by: dholmes

6595669: regtest LinkedBlockingQueue/OfferRemoveLoops.java fails Reviewed-by: dholmes

5080227: (coll spec) Bug in documentation for WeakHashMap Reviewed-by: dholmes

6655515: MBeans tab: operation return values of type Component displayed as String 6439590: MBeans tab: jconsole mbean tree not correctly refreshed 6446434: MBeans tab: Not possible to view MBean content before all MBeans have been initially loaded 6520144: Hard to find MBean Attributes, Operations, and Notifications in Java 6 jconsole 6522091: VMPanel.java contains non-ASCII character 6608334: JConsole fails to display MBean operation with <null> return type 6611445: MBeans tab: MBean tree algorithm wrongly removes intermediate nodes. Reviewed-by: dfuchs, jfdenise

Merge

Merge

4981215: Publishing a port number for management console to access Reviewed-by: emcmanus, dfuchs

6600143: Remove another 450 unnecessary casts Reviewed-by: alanb, iris, lmalvent, bristor, peterjones, darcy, wetmore

6671051: (process) Runtime.exec() hangs if signalled during fork/exec Reviewed-by: iris

6642034: System.getProperty("os.name") returns Windows Vista on Windows Server 2008 (longhorn) Reviewed-by: iris

4960438: (process) Need IO redirection API for subprocesses Reviewed-by: alanb, iris

6631352: File{OutputStream,Writer} should implement atomic append mode using FILE_APPEND_DATA (win) Reviewed-by: alanb, iris

6631437: File{In,Out}putStream minor improvements to spec and stylistic improvements to code Reviewed-by: alanb, iris

6631362: Nuke io_util_md.c:handleFileSizeFD (win) Reviewed-by: alanb, iris

6632696: Writing to closed output files (writeBytes) leaks native memory (unix) Reviewed-by: alanb, iris

6631966: (process) Raise Windows pipe buffer size an extra 24 bytes (win) Reviewed-by: alanb, iris

6633613: (str) StringCoding optimizations to avoid unnecessary array copies with Charset arg Reviewed-by: iris

6671834: (str) Eliminate StringCoding.java compile warnings Reviewed-by: iris

4499288: (cs spec) Charset terminology problems Reviewed-by: mr, iris