OpenJDK / jdk / jdk
changeset 59883:be8f84478783
Merge
author | jwilhelm |
---|---|
date | Tue, 23 Jun 2020 03:05:07 +0200 |
parents | ce082993c9d2 9cfa0137612f |
children | 0b6107622de4 |
files | |
diffstat | 5 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m Mon Jun 22 18:23:49 2020 +0200 +++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m Tue Jun 23 03:05:07 2020 +0200 @@ -90,7 +90,6 @@ CGLCtxInfo *ctxinfo = (CGLCtxInfo *)oglc->ctxInfo; #if USE_NSVIEW_FOR_SCRATCH [ctxinfo->context makeCurrentContext]; - [ctxinfo->context setView: ctxinfo->scratchSurface]; #else [ctxinfo->context clearDrawable]; [ctxinfo->context makeCurrentContext];
--- a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java Mon Jun 22 18:23:49 2020 +0200 +++ b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java Tue Jun 23 03:05:07 2020 +0200 @@ -217,6 +217,7 @@ * is false attempting any of the unsupported class file changes described * in <a href="{@docRoot}/../specs/jvmti.html#RedefineClasses"> * JVM TI RedefineClasses</a> will throw this exception. + * </UL> * * @throws java.lang.NoClassDefFoundError if the bytes * don't correspond to the reference type (the names
--- a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java Mon Jun 22 18:23:49 2020 +0200 +++ b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java Tue Jun 23 03:05:07 2020 +0200 @@ -185,6 +185,7 @@ * </UL> * </TD> * </TR> + * </TBODY> * </TABLE> * * <p> Connectors are created at start-up time. That is, they
--- a/src/jdk.nio.mapmode/share/classes/jdk/nio/mapmode/ExtendedMapMode.java Mon Jun 22 18:23:49 2020 +0200 +++ b/src/jdk.nio.mapmode/share/classes/jdk/nio/mapmode/ExtendedMapMode.java Tue Jun 23 03:05:07 2020 +0200 @@ -25,6 +25,8 @@ package jdk.nio.mapmode; +import java.nio.MappedByteBuffer; +import java.nio.channels.FileChannel; import java.nio.channels.FileChannel.MapMode; /** @@ -52,7 +54,7 @@ /** * File mapping mode for a read-write mapping of a file backed by - * non-volatile RAM. {@linkplain MappedByteBufefr#force force} + * non-volatile RAM. {@linkplain MappedByteBuffer#force force} * operations on a buffer created with this mode will be performed * using cache line writeback rather than proceeding via a file * device flush.
--- a/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java Mon Jun 22 18:23:49 2020 +0200 +++ b/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java Tue Jun 23 03:05:07 2020 +0200 @@ -45,7 +45,7 @@ * this handler interface as the type for parameters, return type, etc. rather * than the abstract class. * - * @param T The type of the object attached to the receive operation + * @param <T> The type of the object attached to the receive operation * * @since 1.7 */