Merge
authorduke
Wed, 05 Jul 2017 22:06:46 +0200
changeset 40475 ce60d6f5c643
parent 40474 93cc31534cc4 (diff)
parent 40471 ad45133ff99e (current diff)
child 40481 5c4e7012ff6e
Merge
jdk/src/java.base/share/classes/java/lang/reflect/AbstractClassLoaderValue.java
jdk/src/java.base/share/classes/java/lang/reflect/ClassLoaderValue.java
jdk/src/java.desktop/share/classes/sun/java2d/marlin/ArrayCache.java
jdk/test/java/lang/reflect/ClassLoaderValue/Driver.java
jdk/test/java/lang/reflect/ClassLoaderValue/java.base/java/lang/reflect/ClassLoaderValueTest.java
--- a/corba/.hgtags	Wed Jul 05 22:06:37 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 22:06:46 2017 +0200
@@ -374,3 +374,4 @@
 c3e83ccab3bb1733ae903d681879a33f85ed465c jdk-9+129
 77f9692d5976ae155773dd3e07533616bb95bae1 jdk-9+130
 f7e1d5337c2e550fe553df7a3886bbed80292ecd jdk-9+131
+1ab4b9399c4cba584f66c1c088188f2f565fbf9c jdk-9+132
--- a/corba/src/java.corba/share/classes/module-info.java	Wed Jul 05 22:06:37 2017 +0200
+++ b/corba/src/java.corba/share/classes/module-info.java	Wed Jul 05 22:06:46 2017 +0200
@@ -23,6 +23,9 @@
  * questions.
  */
 
+/**
+ * Defines the Java binding of the OMG CORBA APIs, and the RMI-IIOP API.
+ */
 module java.corba {
     requires public java.desktop;
     requires public java.rmi;