Thu, 14 May 2015 20:12:26 -0700
Merge
1.1 --- a/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java Wed May 13 12:50:06 2015 -0700 1.2 +++ b/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java Thu May 14 20:12:26 2015 -0700 1.3 @@ -77,7 +77,7 @@ 1.4 * 1.5 * throw SecurityException if SecurityManager is installed and 1.6 * enableSubclassImplementation SerializablePermission 1.7 - * is not granted or jdk.corba.allowOutputStreamSubclass system 1.8 + * is not granted or jdk.corba.allowInputStreamSubclass system 1.9 * property is either not set or is set to 'false' 1.10 */ 1.11 public InputStream() {