6591358: documentation error in URLConnection.setRequestProperty("accept", ...) Summary: Simple doc change, "accept" -> "Accept" Reviewed-by: jccollet

6615656: Removed unimplemented java.net methods Reviewed-by: jccollet

6667108: typo in javadoc for java.net.Socket.getRemoteSocketAddress() Summary: Simple typo in method specification. Reviewed-by: jccollet

6623830: SCCS cleanup has broken two regression tests. Reviewed-by: chegar

6651717: Debug output statement left in MailToURLConnection Summary: Removed output statement, removed unused imports, added override tags. Reviewed-by: chegar

6660405: HttpURLConnection returns the wrong InputStream Summary: Set inputStream back to null in disconnectInternal(). Reviewed-by: chegar

6664612: debug output leaked Reviewed-by: valeriep

6590930: reed/write does not match for ccache Summary: Add null-awareness to ccache read Reviewed-by: valeriep

6648972: KDCReq.init always read padata Summary: PA-DATA is optional, only read it when it exists Reviewed-by: valeriep

6641309: Wrong Cookie separator used in HttpURLConnection Summary: Added a space to cookie separator. Generified the code and added tags. Reviewed-by: chegar

6641312: Fix krb5 codes indentation problems Reviewed-by: xuelei, valeriep, wetmore

6638560: APPCRASH in "SPNEGO_HTTP_AUTH/PROXY_FALLBACK" test case with 64 bit JDK on Win2008 x64, VinVista x64 Summary: Remove incorrect free from native code Reviewed-by: jccollet

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