changeset 40118:f63c761ec2d2

8162819: fix minor Javadoc issues and remove warnings in java.net.Socket Reviewed-by: dfuchs
author clanger
date Wed, 03 Aug 2016 21:15:05 +0200
parents d7a28ec54d11
children ae953a86f275
files jdk/src/java.base/share/classes/java/net/Inet4Address.java jdk/src/java.base/share/classes/java/net/Inet6Address.java jdk/src/java.base/share/classes/java/net/InetAddress.java jdk/src/java.base/share/classes/java/net/Socket.java
diffstat 4 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/java.base/share/classes/java/net/Inet4Address.java	Wed Aug 03 12:55:44 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/net/Inet4Address.java	Wed Aug 03 21:15:05 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, 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
@@ -164,7 +164,7 @@
     }
 
     /**
-     * Utility routine to check if the InetAddress in a wildcard address.
+     * Utility routine to check if the InetAddress is a wildcard address.
      * @return a {@code boolean} indicating if the Inetaddress is
      *         a wildcard address.
      * @since 1.4
--- a/jdk/src/java.base/share/classes/java/net/Inet6Address.java	Wed Aug 03 12:55:44 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/net/Inet6Address.java	Wed Aug 03 21:15:05 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, 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
@@ -691,7 +691,7 @@
     }
 
     /**
-     * Utility routine to check if the InetAddress in a wildcard address.
+     * Utility routine to check if the InetAddress is a wildcard address.
      *
      * @return a {@code boolean} indicating if the Inetaddress is
      *         a wildcard address.
--- a/jdk/src/java.base/share/classes/java/net/InetAddress.java	Wed Aug 03 12:55:44 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/net/InetAddress.java	Wed Aug 03 21:15:05 2016 +0200
@@ -361,7 +361,7 @@
     }
 
     /**
-     * Utility routine to check if the InetAddress in a wildcard address.
+     * Utility routine to check if the InetAddress is a wildcard address.
      * @return a {@code boolean} indicating if the Inetaddress is
      *         a wildcard address.
      * @since 1.4
--- a/jdk/src/java.base/share/classes/java/net/Socket.java	Wed Aug 03 12:55:44 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/net/Socket.java	Wed Aug 03 21:15:05 2016 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2016, 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
@@ -907,7 +907,6 @@
             throw new SocketException("Socket is not connected");
         if (isInputShutdown())
             throw new SocketException("Socket input is shutdown");
-        final Socket s = this;
         InputStream is = null;
         try {
             is = AccessController.doPrivileged(
@@ -947,7 +946,6 @@
             throw new SocketException("Socket is not connected");
         if (isOutputShutdown())
             throw new SocketException("Socket output is shutdown");
-        final Socket s = this;
         OutputStream os = null;
         try {
             os = AccessController.doPrivileged(