archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8191416: (bf) DirectByteBuffer extends MappedByteBuffer, confuses instanceof tests

Browse source 
Change force(), load(), and isLoaded() not to throw UOE if there is no file mapping

Reviewed-by: alanb, rriggs, forax
This commit is contained in:
Brian Burkhalter 2018-02-12 08:19:23 -08:00
parent bf480bcbfe
commit a7b3a19ec4
2 changed files with 62 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/java.base/share/classes/java/nio/MappedByteBuffer.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2018, 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
@ -90,12 +90,6 @@ public abstract class MappedByteBuffer
this.fd = null;
}
private void checkMapped() {
if (fd == null)
// Can only happen if a luser explicitly casts a direct byte buffer
throw new UnsupportedOperationException();
}
// Returns the distance (in bytes) of the buffer from the page aligned address
// of the mapping. Computed each time to avoid storing in every direct buffer.
private long mappingOffset() {
@ -131,7 +125,9 @@ public abstract class MappedByteBuffer
* is resident in physical memory
*/
public final boolean isLoaded() {
checkMapped();
if (fd == null) {
return true;
}
if ((address == 0) || (capacity() == 0))
return true;
long offset = mappingOffset();
@ -153,7 +149,9 @@ public abstract class MappedByteBuffer
* @return This buffer
*/
public final MappedByteBuffer load() {
checkMapped();
if (fd == null) {
return this;
}
if ((address == 0) || (capacity() == 0))
return this;
long offset = mappingOffset();
@ -197,7 +195,9 @@ public abstract class MappedByteBuffer
* @return This buffer
*/
public final MappedByteBuffer force() {
checkMapped();
if (fd == null) {
return this;
}
if ((address != 0) && (capacity() != 0)) {
long offset = mappingOffset();
force0(fd, mappingAddress(offset), mappingLength(offset));

52
test/jdk/java/nio/MappedByteBuffer/SubclassCastUOE.java Normal file
View file

@ -0,0 +1,52 @@
/*
* Copyright (c) 2018, 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 8191416
* @summary Verify no UnsupportedOperationException for cast subclass
*/
import java.nio.ByteBuffer;
import java.nio.MappedByteBuffer;
public class SubclassCastUOE {
public static void main(String[] args) throws Exception {
ByteBuffer buf = ByteBuffer.allocateDirect(37);
if (!(buf instanceof MappedByteBuffer)) {
throw new RuntimeException("Direct buffer not a MappedByteBuffer");
}
if (((MappedByteBuffer)buf).load() != buf) {
throw new RuntimeException("load() did not return same buffer");
}
if (!((MappedByteBuffer)buf).isLoaded()) {
throw new RuntimeException("isLoaded() returned false");
}
if (((MappedByteBuffer)buf).force() != buf) {
throw new RuntimeException("force() did not return same buffer");
}
}
}