changeset 981:3b19c17ea11c jdk8u60-b16

Merge
author lana
date Thu, 14 May 2015 20:12:26 -0700
parents 4d3efd61114f (current diff) 10d4fc493572 (diff)
children 7ef66778231f 303fd9eb7e21
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java	Wed May 13 12:50:06 2015 -0700
+++ b/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java	Thu May 14 20:12:26 2015 -0700
@@ -77,7 +77,7 @@
      *
      * throw SecurityException if SecurityManager is installed and
      * enableSubclassImplementation SerializablePermission
-     * is not granted or jdk.corba.allowOutputStreamSubclass system
+     * is not granted or jdk.corba.allowInputStreamSubclass system
      * property is either not set or is set to 'false'
      */
     public InputStream() {