Mercurial > hg > openjdk > jdk9 > corba
changeset 831:16e84753114b
Merge
author | lana |
---|---|
date | Thu, 26 Jan 2017 21:20:28 +0000 |
parents | e12f6db81ec6 (current diff) b33379591dea (diff) |
children | a545f54babfa |
files | |
diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/InputStream.java Thu Jan 26 19:22:37 2017 +0000 +++ b/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());
--- a/src/java.corba/share/classes/org/omg/CORBA_2_3/portable/OutputStream.java Thu Jan 26 19:22:37 2017 +0000 +++ b/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());