--- old/src/java.base/windows/classes/sun/nio/ch/Iocp.java 2020-04-28 18:34:56.157850785 +0100 +++ new/src/java.base/windows/classes/sun/nio/ch/Iocp.java 2020-04-28 18:34:56.039849564 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -317,7 +317,7 @@ myGroupAndInvokeCount.resetInvokeCount(); // wait for I/O completion event - // A error here is fatal (thread will not be replaced) + // An error here is fatal (thread will not be replaced) replaceMe = false; try { getQueuedCompletionStatus(port, ioResult); --- old/src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java 2020-04-28 18:34:56.580855161 +0100 +++ new/src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java 2020-04-28 18:34:56.462853940 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -143,7 +143,6 @@ // simulate the failure of all pending I/O operations. for (Long ov: pendingIoMap.keySet()) { PendingFuture result = pendingIoMap.get(ov); - assert !result.isDone(); // make I/O port aware of the stale OVERLAPPED structure Iocp iocp = (Iocp)((Groupable)result.channel()).group(); --- old/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java 2020-04-28 18:34:57.011859619 +0100 +++ new/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java 2020-04-28 18:34:56.891858377 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -228,7 +228,6 @@ @Override public void run() { long overlapped = 0L; - boolean pending = false; try { begin(); @@ -242,7 +241,6 @@ overlapped); if (n == IOStatus.UNAVAILABLE) { // I/O is pending - pending = true; return; } // acquired lock immediately @@ -253,9 +251,9 @@ // lock failed or channel closed removeFromFileLockTable(fli); result.setFailure(toIOException(x)); - } finally { - if (!pending && overlapped != 0L) + if (overlapped != 0L) ioCache.remove(overlapped); + } finally { end(); } @@ -448,13 +446,12 @@ } catch (Throwable x) { // failed to initiate read result.setFailure(toIOException(x)); + if (overlapped != 0L) + ioCache.remove(overlapped); } finally { - if (!pending) { + if (!pending) // release resources - if (overlapped != 0L) - ioCache.remove(overlapped); releaseBufferIfSubstituted(); - } end(); } @@ -628,9 +625,9 @@ result.setFailure(toIOException(x)); // release resources + releaseBufferIfSubstituted(); if (overlapped != 0L) ioCache.remove(overlapped); - releaseBufferIfSubstituted(); } finally { end(); --- old/src/java.base/windows/native/libnio/ch/WindowsAsynchronousFileChannelImpl.c 2020-04-28 18:34:57.458864242 +0100 +++ new/src/java.base/windows/native/libnio/ch/WindowsAsynchronousFileChannelImpl.c 2020-04-28 18:34:57.331862929 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -115,7 +115,7 @@ if (error == ERROR_IO_PENDING) { return IOS_UNAVAILABLE; } - JNU_ThrowIOExceptionWithLastError(env, "WriteFile failed"); + JNU_ThrowIOExceptionWithLastError(env, "LockFile failed"); return IOS_THROWN; } return 0; --- /dev/null 2020-04-28 09:12:16.825530823 +0100 +++ new/test/jdk/java/nio/channels/AsynchronousFileChannel/LockReadWriteStressTest.java 2020-04-28 18:34:57.779867563 +0100 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* @test + * @bug 8184157 + * @summary Ensure that correct PendingFuture is used in Iocp completion status event handler + * @requires (os.family == "windows") + */ + +import java.nio.ByteBuffer; +import java.nio.channels.AsynchronousFileChannel; +import java.nio.channels.FileLock; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import static java.nio.file.StandardOpenOption.*; + +public class LockReadWriteStressTest { + public static void main(String[] args) throws Exception { + Path path = Path.of("blah"); + ByteBuffer buf = ByteBuffer.allocate(16); + for (int i=0; i < 1000; i++) { + try (AsynchronousFileChannel ch = AsynchronousFileChannel.open(path,READ, WRITE, CREATE)) { + FileLock lock = ch.lock().get(); + ch.read(buf, 0).get(); + buf.rewind(); + ch.write(buf, 0).get(); + lock.release(); + buf.clear(); + } + } + } +}