stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7023403: (ch) sun.nio.ch.SolarisEventPort.startPoll failed with AssertionError

Browse Source 
Reviewed-by: forax
This commit is contained in:
Alan Bateman 2011-03-04 21:26:50 +00:00
parent 7b97cd1c34
commit d048451ca2
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jdk/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java
View File

@ -137,7 +137,7 @@ class UnixAsynchronousSocketChannelImpl
return port; return port;
} }
// register for events if there are outstanding I/O operations // register events for outstanding I/O operations, caller already owns updateLock
private void updateEvents() { private void updateEvents() {
assert Thread.holdsLock(updateLock); assert Thread.holdsLock(updateLock);
int events = 0; int events = 0;
@ -149,6 +149,13 @@ class UnixAsynchronousSocketChannelImpl
port.startPoll(fdVal, events); port.startPoll(fdVal, events);
} }
// register events for outstanding I/O operations
private void lockAndUpdateEvents() {
synchronized (updateLock) {
updateEvents();
}
}
// invoke to finish read and/or write operations // invoke to finish read and/or write operations
private void finish(boolean mayInvokeDirect, private void finish(boolean mayInvokeDirect,
boolean readable, boolean readable,
@ -402,9 +409,8 @@ class UnixAsynchronousSocketChannelImpl
exc = x; exc = x;
} finally { } finally {
// restart poll in case of concurrent write // restart poll in case of concurrent write
synchronized (updateLock) { if (!(exc instanceof AsynchronousCloseException))
updateEvents(); lockAndUpdateEvents();
}
end(); end();
} }
@ -598,9 +604,8 @@ class UnixAsynchronousSocketChannelImpl
exc = x; exc = x;
} finally { } finally {
// restart poll in case of concurrent write // restart poll in case of concurrent write
synchronized (updateLock) { if (!(exc instanceof AsynchronousCloseException))
updateEvents(); lockAndUpdateEvents();
}
end(); end();
} }

2
jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
View File

@ -22,7 +22,7 @@
*/ */
/* @test /* @test
* @bug 4607272 6842687 6878369 * @bug 4607272 6842687 6878369 6944810 7023403
* @summary Unit test for AsynchronousSocketChannel * @summary Unit test for AsynchronousSocketChannel
* @run main/timeout=600 Basic * @run main/timeout=600 Basic
*/ */