changeset 50619:7f135cad741e switch

Automatic merge with default
author mcimadamore
date Thu, 10 May 2018 22:08:15 +0200
parents 2b2f7f718910 5730ca794584
children 2934689eff44
files make/launcher/Launcher-java.desktop.gmk src/bsd/doc/man/appletviewer.1 src/bsd/doc/man/ja/appletviewer.1 src/hotspot/share/classfile/sharedClassUtil.cpp src/hotspot/share/classfile/sharedClassUtil.hpp src/hotspot/share/classfile/systemDictionary_ext.hpp src/hotspot/share/runtime/advancedThresholdPolicy.cpp src/hotspot/share/runtime/advancedThresholdPolicy.hpp src/hotspot/share/services/metaspaceDCmd.cpp src/java.base/share/classes/module-info.java src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ClassForNamePlugin.java src/linux/doc/man/appletviewer.1 src/linux/doc/man/ja/appletviewer.1 src/solaris/doc/sun/man/man1/appletviewer.1 src/solaris/doc/sun/man/man1/ja/appletviewer.1 test/hotspot/jtreg/compiler/tiered/TransitionsTestExecutor.java test/jdk/com/sun/crypto/provider/KeyAgreement/DHGenSecretKey.java test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh test/jdk/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html test/jdk/java/lang/invoke/I4Special.jcod test/jdk/javax/print/applet/AppletPrintLookup.html test/jdk/javax/print/applet/AppletPrintLookup.sh test/jdk/javax/print/applet/YesNo.java test/jdk/javax/print/applet/applet0/Applet0.java test/jdk/javax/print/applet/applet1/Applet1.java test/jdk/javax/print/applet/applet1/Applet1PrintService.java test/jdk/javax/print/applet/applet1/Applet1PrintServiceLookup.java test/jdk/javax/print/applet/applet1/META-INF/services/javax.print.PrintServiceLookup test/jdk/javax/print/applet/applet2/Applet2.java test/jdk/javax/print/applet/applet2/Applet2PrintService.java test/jdk/javax/print/applet/applet2/Applet2PrintServiceLookup.java test/jdk/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup test/jdk/javax/print/applet/applet3/Applet3.java test/jdk/javax/print/applet/applet3/Applet3PrintService.java test/jdk/javax/print/applet/applet4/Applet4.java test/jdk/javax/print/applet/applet4/Applet4PrintService.java test/jdk/javax/print/applet/applet4/Applet4PrintServiceLookup.java
diffstat 4062 files changed, 641963 insertions(+), 12304 deletions(-) [+]