# HG changeset patch
# User lana
# Date 1485465628 0
# Node ID 7f8b1ccf3d8e937fb9116fe3b6d9ae00f2e08985
# Parent  073fb159ebeb66a2a63151f5be5371b76aa3cfe0# Parent  06ccc488139424f18229fe8a36d882b03e232e41
Merge

diff -r 073fb159ebeb -r 7f8b1ccf3d8e corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java
--- a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java	Thu Jan 26 19:22:37 2017 +0000
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java	Thu Jan 26 21:20:28 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -75,10 +75,11 @@
     /**
      * Create a new instance of this class.
      *
-     * throw SecurityException if SecurityManager is installed and
+     * @implNote
+     * Throws SecurityException if SecurityManager is installed and
      * enableSubclassImplementation SerializablePermission
      * is not granted or jdk.corba.allowInputStreamSubclass system
-     * property is either not set or is set to 'false'
+     * property is either not set or is set to 'false'.
      */
     public InputStream() {
         this(checkPermission());
diff -r 073fb159ebeb -r 7f8b1ccf3d8e corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java
--- a/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java	Thu Jan 26 19:22:37 2017 +0000
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java	Thu Jan 26 21:20:28 2017 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -72,10 +72,11 @@
     /**
      * Create a new instance of this class.
      *
-     * throw SecurityException if SecurityManager is installed and
+     * @implNote
+     * Throws SecurityException if SecurityManager is installed and
      * enableSubclassImplementation SerializablePermission
      * is not granted or jdk.corba.allowOutputStreamSubclass system
-     * property is either not set or is set to 'false'
+     * property is either not set or is set to 'false'.
      */
     public OutputStream() {
         this(checkPermission());