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

6824135: (ch) test/java/nio/channels/AsyncCloseAndInterrupt.java fails (lnx)

Browse Source 
Reviewed-by: sherman
This commit is contained in:
Alan Bateman 2009-04-02 11:13:56 +01:00
parent 1870624c08
commit d2cd251815
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java
View File

@ -128,9 +128,10 @@ public class FileChannelImpl
throw new NonReadableChannelException();
synchronized (positionLock) {
int n = 0;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return 0;
do {
@ -151,9 +152,10 @@ public class FileChannelImpl
throw new NonReadableChannelException();
synchronized (positionLock) {
long n = 0;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return 0;
do {
@ -183,9 +185,10 @@ public class FileChannelImpl
throw new NonWritableChannelException();
synchronized (positionLock) {
int n = 0;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return 0;
do {
@ -206,9 +209,10 @@ public class FileChannelImpl
throw new NonWritableChannelException();
synchronized (positionLock) {
long n = 0;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return 0;
do {
@ -239,9 +243,10 @@ public class FileChannelImpl
ensureOpen();
synchronized (positionLock) {
long p = -1;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return 0;
do {
@ -262,9 +267,10 @@ public class FileChannelImpl
throw new IllegalArgumentException();
synchronized (positionLock) {
long p = -1;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return null;
do {
@ -283,9 +289,10 @@ public class FileChannelImpl
ensureOpen();
synchronized (positionLock) {
long s = -1;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return -1;
do {
@ -311,9 +318,10 @@ public class FileChannelImpl
synchronized (positionLock) {
int rv = -1;
long p = -1;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return null;
@ -350,9 +358,10 @@ public class FileChannelImpl
public void force(boolean metaData) throws IOException {
ensureOpen();
int rv = -1;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return;
do {
@ -406,9 +415,10 @@ public class FileChannelImpl
return IOStatus.UNSUPPORTED;
long n = -1;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return -1;
do {
@ -612,9 +622,10 @@ public class FileChannelImpl
throw new NonReadableChannelException();
ensureOpen();
int n = 0;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return -1;
do {
@ -637,9 +648,10 @@ public class FileChannelImpl
throw new NonWritableChannelException();
ensureOpen();
int n = 0;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return -1;
do {
@ -731,9 +743,10 @@ public class FileChannelImpl
throw new NonReadableChannelException();
long addr = -1;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return null;
if (size() < position + size) { // Extend file size
@ -900,9 +913,10 @@ public class FileChannelImpl
FileLockTable flt = fileLockTable();
flt.add(fli);
boolean i = true;
int ti = threads.add();
int ti = -1;
try {
begin();
ti = threads.add();
if (!isOpen())
return null;
int result = nd.lock(fd, true, position, size, shared);

2
jdk/test/java/nio/channels/AsyncCloseAndInterrupt.java
View File

@ -22,7 +22,7 @@
*/
/* @test
* @bug 4460583 4470470 4840199 6419424 6710579 6596323
* @bug 4460583 4470470 4840199 6419424 6710579 6596323 6824135
* @summary Comprehensive test of asynchronous closing and interruption
* @author Mark Reinhold
*/