[8u60] RFR of 8071599: (so) Socket adapter sendUrgentData throws IllegalBlockingMode when channel configured non-blocking

[Alan Bateman]

On 23/02/2015 22:14, Brian Burkhalter wrote:
>
> :
>
> diff --git 
> a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java 
> b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
> --- a/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
> +++ b/src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
> @@ -520,6 +520,8 @@
>
>
>   // package-private
>   int sendOutOfBandData(byte b) throws IOException {
> +       assert Thread.holdsLock(this.blockingLock()) :
> +           "Blocking lock not held by SocketChannel";
>       synchronized (writeLock) {
>           ensureWriteOpen();
>           int n = 0;
> diff --git a/test/java/nio/channels/SocketChannel/SendUrgentData.java 
> b/test/java/nio/channels/SocketChannel/SendUrgentData.java
> --- a/test/java/nio/channels/SocketChannel/SendUrgentData.java
> +++ b/test/java/nio/channels/SocketChannel/SendUrgentData.java
> @@ -27,8 +27,7 @@
>  import java.nio.channels.ServerSocketChannel;
>  import java.nio.channels.SocketChannel;
>
>
> -/*
> - * @test
> +/* @test
> * @bug 8071599
> * @run main/othervm SendUrgentData
> * @run main/othervm SendUrgentData -inline

I should have been clearer, I meant to put move it up so that it's 
immediately after the copyright header to keep it consistent with the 
other tests in this area.

-Alan.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openjdk.java.net/pipermail/nio-dev/attachments/20150223/ffffc2ba/attachment.html>