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

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2020-06-23 03:05:07 +02:00
commit b7e944953e
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.m
View File

@ -90,7 +90,6 @@ JNF_COCOA_ENTER(env);
CGLCtxInfo *ctxinfo = (CGLCtxInfo *)oglc->ctxInfo; CGLCtxInfo *ctxinfo = (CGLCtxInfo *)oglc->ctxInfo;
#if USE_NSVIEW_FOR_SCRATCH #if USE_NSVIEW_FOR_SCRATCH
[ctxinfo->context makeCurrentContext]; [ctxinfo->context makeCurrentContext];
[ctxinfo->context setView: ctxinfo->scratchSurface];
#else #else
[ctxinfo->context clearDrawable]; [ctxinfo->context clearDrawable];
[ctxinfo->context makeCurrentContext]; [ctxinfo->context makeCurrentContext];

1
src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java
View File

@ -217,6 +217,7 @@ public interface VirtualMachine extends Mirror {
* is false attempting any of the unsupported class file changes described * is false attempting any of the unsupported class file changes described
* in <a href="{@docRoot}/../specs/jvmti.html#RedefineClasses"> * in <a href="{@docRoot}/../specs/jvmti.html#RedefineClasses">
* JVM TI RedefineClasses</a> will throw this exception. * JVM TI RedefineClasses</a> will throw this exception.
* </UL>
* *
* @throws java.lang.NoClassDefFoundError if the bytes * @throws java.lang.NoClassDefFoundError if the bytes
* don't correspond to the reference type (the names * don't correspond to the reference type (the names

1
src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java
View File

@ -185,6 +185,7 @@ import com.sun.jdi.event.VMStartEvent;
* </UL> * </UL>
* </TD> * </TD>
* </TR> * </TR>
* </TBODY>
* </TABLE> * </TABLE>
* *
* <p> Connectors are created at start-up time. That is, they * <p> Connectors are created at start-up time. That is, they

4
src/jdk.nio.mapmode/share/classes/jdk/nio/mapmode/ExtendedMapMode.java
View File

@ -25,6 +25,8 @@
package jdk.nio.mapmode; package jdk.nio.mapmode;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.FileChannel.MapMode; 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 * 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 * operations on a buffer created with this mode will be performed
* using cache line writeback rather than proceeding via a file * using cache line writeback rather than proceeding via a file
* device flush. * device flush.

2
src/jdk.sctp/share/classes/com/sun/nio/sctp/NotificationHandler.java
View File

@ -45,7 +45,7 @@ package com.sun.nio.sctp;
* this handler interface as the type for parameters, return type, etc. rather * this handler interface as the type for parameters, return type, etc. rather
* than the abstract class. * 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 * @since 1.7
*/ */