stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8041395: Doclint regression in java.net.SocketOption

Browse Source 
Reviewed-by: lancea
This commit is contained in:
Joe Darcy 2015-02-09 15:33:56 -08:00
parent 5c35079895
commit 0d5c151c94
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/java.base/share/classes/java/net/DatagramSocket.java
View File

@ -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 @@ class DatagramSocket implements java.io.Closeable {
/**
* Sets the value of a socket option.
*
* @param <T> 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 @@ class DatagramSocket implements java.io.Closeable {
/**
* Returns the value of a socket option.
*
* @param <T> The type of the socket option value
* @param name The socket option
*
* @return The value of the socket option.

8
jdk/src/java.base/share/classes/java/net/DatagramSocketImpl.java
View File

@ -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 @@ public abstract class DatagramSocketImpl implements SocketOptions {
/**
* Called to set a socket option.
*
* @param <T> 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 @@ public abstract class DatagramSocketImpl implements SocketOptions {
* 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 <T> void setOption(SocketOption<T> name, T value) throws IOException {
@ -308,12 +309,15 @@ public abstract class DatagramSocketImpl implements SocketOptions {
/**
* Called to get a socket option.
*
* @return the socket option
* @param <T> 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
*/

4
jdk/src/java.base/share/classes/java/net/ServerSocket.java
View File

@ -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 @@ class ServerSocket implements java.io.Closeable {
/**
* Sets the value of a socket option.
*
* @param <T> 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 @@ class ServerSocket implements java.io.Closeable {
/**
* Returns the value of a socket option.
*
* @param <T> The type of the socket option value
* @param name The socket option
*
* @return The value of the socket option.

4
jdk/src/java.base/share/classes/java/net/Socket.java
View File

@ -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 @@ class Socket implements java.io.Closeable {
/**
* Sets the value of a socket option.
*
* @param <T> 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 @@ class Socket implements java.io.Closeable {
/**
* Returns the value of a socket option.
*
* @param <T> The type of the socket option value
* @param name The socket option
*
* @return The value of the socket option.

4
jdk/src/java.base/share/classes/java/net/SocketImpl.java
View File

@ -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 @@ public abstract class SocketImpl implements SocketOptions {
/**
* Called to set a socket option.
*
* @param <T> 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 @@ public abstract class SocketImpl implements SocketOptions {
/**
* Called to get a socket option.
*
* @param <T> The type of the socket option value
* @param name The socket option
*
* @return the value of the named option