From 9a120e7f79fc97bd3190ba9bb20989ce48f0cca1 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Mon, 22 Jun 2020 09:29:16 -0700 Subject: [PATCH 1/3] 8247959: doclint errors in NIO code Reviewed-by: alanb, lancea --- .../share/classes/jdk/nio/mapmode/ExtendedMapMode.java | 4 +++- .../share/classes/com/sun/nio/sctp/NotificationHandler.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/jdk.nio.mapmode/share/classes/jdk/nio/mapmode/ExtendedMapMode.java b/src/jdk.nio.mapmode/share/classes/jdk/nio/mapmode/ExtendedMapMode.java index 7f9a40cee01..4c2d02d78cc 100644 --- a/src/jdk.nio.mapmode/share/classes/jdk/nio/mapmode/ExtendedMapMode.java +++ b/src/jdk.nio.mapmode/share/classes/jdk/nio/mapmode/ExtendedMapMode.java @@ -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 @@ public class ExtendedMapMode { /** * 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. diff --git a/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java b/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java index 9e5f239f297..accfb9f8b58 100644 --- a/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java +++ b/src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java @@ -45,7 +45,7 @@ package com.sun.nio.sctp; * 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 The type of the object attached to the receive operation * * @since 1.7 */ From 9a99f511aa218f465a9789d61d11e299ffa02bf7 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Mon, 22 Jun 2020 09:42:42 -0700 Subject: [PATCH 2/3] 8247958: minor HTML errors in com.sun.jdi Reviewed-by: dholmes, sspitsyn --- src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java | 1 + src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java index 14a100a1f8c..a449b55df1e 100644 --- a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java @@ -217,6 +217,7 @@ public interface VirtualMachine extends Mirror { * is false attempting any of the unsupported class file changes described * in * JVM TI RedefineClasses will throw this exception. + * * * @throws java.lang.NoClassDefFoundError if the bytes * don't correspond to the reference type (the names diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java index 2431f6c02ed..8b5957dc0d9 100644 --- a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java @@ -185,6 +185,7 @@ import com.sun.jdi.event.VMStartEvent; * * * + * * * *

Connectors are created at start-up time. That is, they From 12554c2c039a73aa81b30a5f44b33d5fec8594fa Mon Sep 17 00:00:00 2001 From: Phil Race Date: Mon, 22 Jun 2020 13:37:41 -0700 Subject: [PATCH 3/3] 8244818: Java2D Queue Flusher crash while moving application window to external monitor Reviewed-by: serb, jdv, kcr --- .../macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m | 1 - 1 file changed, 1 deletion(-) diff --git a/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m index 235ae7bc129..b83b69a1c19 100644 --- a/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m +++ b/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m @@ -90,7 +90,6 @@ JNF_COCOA_ENTER(env); 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];