# HG changeset patch # User darcy # Date 1423524836 28800 # Node ID a581c7868768f59d185954ec888318bf15e18b98 # Parent e4c16ed7bffaea714b3413de1ae279670e1686a8 8041395: Doclint regression in java.net.SocketOption Reviewed-by: lancea diff -r e4c16ed7bffa -r a581c7868768 jdk/src/java.base/share/classes/java/net/DatagramSocket.java --- a/jdk/src/java.base/share/classes/java/net/DatagramSocket.java Mon Feb 09 13:32:42 2015 -0800 +++ b/jdk/src/java.base/share/classes/java/net/DatagramSocket.java Mon Feb 09 15:33:56 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2015, 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 @@ -1308,6 +1308,7 @@ /** * Sets the value of a socket option. * + * @param The type of the socket option value * @param name The socket option * @param value The value of the socket option. A value of {@code null} * may be valid for some options. @@ -1342,6 +1343,7 @@ /** * Returns the value of a socket option. * + * @param The type of the socket option value * @param name The socket option * * @return The value of the socket option. diff -r e4c16ed7bffa -r a581c7868768 jdk/src/java.base/share/classes/java/net/DatagramSocketImpl.java --- a/jdk/src/java.base/share/classes/java/net/DatagramSocketImpl.java Mon Feb 09 13:32:42 2015 -0800 +++ b/jdk/src/java.base/share/classes/java/net/DatagramSocketImpl.java Mon Feb 09 15:33:56 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2015, 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 @@ -267,6 +267,7 @@ /** * Called to set a socket option. * + * @param The type of the socket option value * @param name The socket option * * @param value The value of the socket option. A value of {@code null} @@ -276,7 +277,7 @@ * support the option * * @throws NullPointerException if name is {@code null} - * + * @throws IOException if an I/O problem occurs while attempting to set the option * @since 1.9 */ protected void setOption(SocketOption name, T value) throws IOException { @@ -308,12 +309,15 @@ /** * Called to get a socket option. * + * @return the socket option + * @param The type of the socket option value * @param name The socket option * * @throws UnsupportedOperationException if the DatagramSocketImpl does not * support the option * * @throws NullPointerException if name is {@code null} + * @throws IOException if an I/O problem occurs while attempting to set the option * * @since 1.9 */ diff -r e4c16ed7bffa -r a581c7868768 jdk/src/java.base/share/classes/java/net/ServerSocket.java --- a/jdk/src/java.base/share/classes/java/net/ServerSocket.java Mon Feb 09 13:32:42 2015 -0800 +++ b/jdk/src/java.base/share/classes/java/net/ServerSocket.java Mon Feb 09 15:33:56 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2015, 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 @@ -924,6 +924,7 @@ /** * Sets the value of a socket option. * + * @param The type of the socket option value * @param name The socket option * @param value The value of the socket option. A value of {@code null} * may be valid for some options. @@ -957,6 +958,7 @@ /** * Returns the value of a socket option. * + * @param The type of the socket option value * @param name The socket option * * @return The value of the socket option. diff -r e4c16ed7bffa -r a581c7868768 jdk/src/java.base/share/classes/java/net/Socket.java --- a/jdk/src/java.base/share/classes/java/net/Socket.java Mon Feb 09 13:32:42 2015 -0800 +++ b/jdk/src/java.base/share/classes/java/net/Socket.java Mon Feb 09 15:33:56 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2015, 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 @@ -1727,6 +1727,7 @@ /** * Sets the value of a socket option. * + * @param The type of the socket option value * @param name The socket option * @param value The value of the socket option. A value of {@code null} * may be valid for some options. @@ -1758,6 +1759,7 @@ /** * Returns the value of a socket option. * + * @param The type of the socket option value * @param name The socket option * * @return The value of the socket option. diff -r e4c16ed7bffa -r a581c7868768 jdk/src/java.base/share/classes/java/net/SocketImpl.java --- a/jdk/src/java.base/share/classes/java/net/SocketImpl.java Mon Feb 09 13:32:42 2015 -0800 +++ b/jdk/src/java.base/share/classes/java/net/SocketImpl.java Mon Feb 09 15:33:56 2015 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2015, 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 @@ -362,6 +362,7 @@ /** * Called to set a socket option. * + * @param The type of the socket option value * @param name The socket option * * @param value The value of the socket option. A value of {@code null} @@ -397,6 +398,7 @@ /** * Called to get a socket option. * + * @param The type of the socket option value * @param name The socket option * * @return the value of the named option