This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[PATCH] java.net
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Wed, 12 Feb 2003 08:54:49 +0100
- Subject: [PATCH] java.net
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I wrote a little patch for java.net. Nothing intrusive. Mostly merges
with classpath. Please review and comment.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+Sf3MWSOgCCdjSDsRAstJAJ4ler8955lCK7HVXstn8bFGghBy7ACeM3gn
tLy0F9IeHLilOfUKxW0+Csk=
=UV/0
-----END PGP SIGNATURE-----
--- /home/mkoch/src/gcc-cvs/libjava/ChangeLog 2003-02-11 16:40:40.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/ChangeLog 2003-02-12 08:13:04.000000000 +0100
@@ -1,3 +1,16 @@
+2003-02-12 Michael Koch <konqueror@gmx.de>
+
+ * java/net/NetPermission.java
+ (NetPermission): Make doucmentation match the method declaration.
+ * java/net/NetworkInterface.java
+ (equals): Reformated for GNU coding style.
+ * java/net/ServerSocket.java: Merged with classpath.
+ * java/net/Socket.java: Partly merged with classpath (Added some @since).
+ * java/net/SocketImpl.java
+ (localPort): Merged with classpath (initialize with -1).
+ * java/net/SocketPermission.java: Merged with classpath (reindented).
+ * java/net/URLDecoder.java: Merged with classpath (reindented).
+
2003-02-11 Michael Koch <konqueror@gmx.de>
* Makefile.in
--- /home/mkoch/src/gcc-cvs/libjava/java/net/NetPermission.java 2003-01-14 22:47:08.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/net/NetPermission.java 2003-02-11 14:26:52.000000000 +0100
@@ -64,7 +64,7 @@
/**
* Initializes a new instance of <code>NetPermission</code> with the
- * specified name and value. Note that the value field is irrelevant and is
+ * specified name and perms. Note that the perms field is irrelevant and is
* ignored. This constructor should never need to be used.
*
* @param name The name of this permission
--- /home/mkoch/src/gcc-cvs/libjava/java/net/NetworkInterface.java 2002-10-10 07:19:22.000000000 +0200
+++ /home/mkoch/src/gcc-work/libjava/java/net/NetworkInterface.java 2003-02-11 14:26:46.000000000 +0100
@@ -200,8 +200,9 @@
return false;
NetworkInterface tmp = (NetworkInterface) obj;
- return name.equals (tmp.name) &&
- inetAddresses.equals (tmp.inetAddresses);
+
+ return (name.equals (tmp.name)
+ && inetAddresses.equals (tmp.inetAddresses));
}
/**
--- /home/mkoch/src/gcc-cvs/libjava/java/net/ServerSocket.java 2003-01-11 10:13:04.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/net/ServerSocket.java 2003-02-11 13:41:38.000000000 +0100
@@ -356,7 +356,7 @@
}
catch (SocketException e)
{
- return false;
+ return false;
}
return true;
--- /home/mkoch/src/gcc-cvs/libjava/java/net/Socket.java 2003-01-11 10:13:04.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/net/Socket.java 2003-02-11 13:42:01.000000000 +0100
@@ -95,6 +95,7 @@
* might want this behavior.
*
* @specnote This constructor is public since JDK 1.4
+ * @since 1.1
*/
public Socket ()
{
@@ -122,6 +123,8 @@
* <code>Socket</code>
*
* @exception SocketException If an error occurs
+ *
+ * @since 1.1
*/
protected Socket (SocketImpl impl) throws SocketException
{
@@ -180,6 +183,8 @@
* exists and does not allow a connection to the specified host/port or
* binding to the specified local host/port.
* @exception IOException If a connection error occurs.
+ *
+ * @since 1.1
*/
public Socket (String host, int port,
InetAddress localAddr, int localPort) throws IOException
@@ -200,6 +205,8 @@
* @exception IOException If an error occurs
* @exception SecurityException If a security manager exists and its
* checkConnect method doesn't allow the operation
+ *
+ * @since 1.1
*/
public Socket (InetAddress address, int port,
InetAddress localAddr, int localPort) throws IOException
@@ -396,6 +403,8 @@
* is not connected, then <code>null</code> is returned.
*
* @return The local address
+ *
+ * @since 1.1
*/
public InetAddress getLocalAddress ()
{
@@ -521,6 +530,8 @@
* @param on true to enable, false to disable
*
* @exception SocketException If an error occurs or Socket is not connected
+ *
+ * @since 1.1
*/
public void setTcpNoDelay (boolean on) throws SocketException
{
@@ -539,6 +550,8 @@
* @return Whether or not TCP_NODELAY is set
*
* @exception SocketException If an error occurs or Socket not connected
+ *
+ * @since 1.1
*/
public boolean getTcpNoDelay() throws SocketException
{
@@ -567,6 +580,8 @@
*
* @exception SocketException If an error occurs or Socket not connected
* @exception IllegalArgumentException If linger is negative
+ *
+ * @since 1.1
*/
public void setSoLinger(boolean on, int linger) throws SocketException
{
@@ -602,6 +617,8 @@
* if SO_LINGER not set
*
* @exception SocketException If an error occurs or Socket is not connected
+ *
+ * @since 1.1
*/
public int getSoLinger() throws SocketException
{
@@ -681,6 +698,8 @@
* 0 if not set
*
* @exception SocketException If an error occurs or Socket not connected
+ *
+ * @since 1.1
*/
public synchronized void setSoTimeout (int timeout) throws SocketException
{
@@ -707,6 +726,8 @@
* if not set
*
* @exception SocketException If an error occurs or Socket not connected
+ *
+ * @since 1.1
*/
public synchronized int getSoTimeout () throws SocketException
{
@@ -822,7 +843,7 @@
*
* @exception SocketException If an error occurs or Socket is not connected
*
- * @since Java 1.3
+ * @since 1.3
*/
public void setKeepAlive (boolean on) throws SocketException
{
@@ -840,7 +861,7 @@
*
* @exception SocketException If an error occurs or Socket is not connected
*
- * @since Java 1.3
+ * @since 1.3
*/
public boolean getKeepAlive () throws SocketException
{
@@ -918,6 +939,8 @@
* Closes the input side of the socket stream.
*
* @exception IOException If an error occurs.
+ *
+ * @since 1.3
*/
public void shutdownInput() throws IOException
{
@@ -931,6 +954,8 @@
* Closes the output side of the socket stream.
*
* @exception IOException If an error occurs.
+ *
+ * @since 1.3
*/
public void shutdownOutput() throws IOException
{
@@ -944,6 +969,8 @@
* Returns the socket channel associated with this socket.
*
* It returns null if no associated socket exists.
+ *
+ * @since 1.4
*/
public SocketChannel getChannel()
{
@@ -1032,6 +1059,8 @@
/**
* Checks if the socket is connected
+ *
+ * @since 1.4
*/
public boolean isConnected ()
{
@@ -1040,6 +1069,8 @@
/**
* Checks if the socket is already bound.
+ *
+ * @since 1.4
*/
public boolean isBound ()
{
@@ -1048,6 +1079,8 @@
/**
* Checks if the socket is closed.
+ *
+ * @since 1.4
*/
public boolean isClosed ()
{
@@ -1056,6 +1089,8 @@
/**
* Checks if the socket's input stream is shutdown
+ *
+ * @since 1.4
*/
public boolean isInputShutdown ()
{
@@ -1064,6 +1099,8 @@
/**
* Checks if the socket's output stream is shutdown
+ *
+ * @since 1.4
*/
public boolean isOutputShutdown ()
{
--- /home/mkoch/src/gcc-cvs/libjava/java/net/SocketImpl.java 2003-01-20 13:11:50.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/net/SocketImpl.java 2003-02-11 13:42:07.000000000 +0100
@@ -74,7 +74,7 @@
/**
* The port number the socket is bound to locally
*/
- protected int localport;
+ protected int localport = -1;
/**
* The port number of the remote end of the socket connection
--- /home/mkoch/src/gcc-cvs/libjava/java/net/SocketPermission.java 2003-01-08 16:43:05.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/net/SocketPermission.java 2003-02-11 13:42:37.000000000 +0100
@@ -276,62 +276,62 @@
// Get ours
if (hostport.indexOf(":") == -1)
{
- ourfirstport = 0;
- ourlastport = 65535;
+ ourfirstport = 0;
+ ourlastport = 65535;
}
else
{
- // FIXME: Needs bulletproofing.
- // This will dump if hostport if all sorts of bad data was passed to
- // the constructor
- String range = hostport.substring(hostport.indexOf(":") + 1);
- if (range.startsWith("-"))
- ourfirstport = 0;
- else if (range.indexOf("-") == -1)
- ourfirstport = Integer.parseInt(range);
- else
- ourfirstport =
- Integer.parseInt(range.substring(0, range.indexOf("-")));
-
- if (range.endsWith("-"))
- ourlastport = 65535;
- else if (range.indexOf("-") == -1)
- ourlastport = Integer.parseInt(range);
- else
- ourlastport =
- Integer.parseInt(range.
- substring(range.indexOf("-") + 1,
- range.length()));
+ // FIXME: Needs bulletproofing.
+ // This will dump if hostport if all sorts of bad data was passed to
+ // the constructor
+ String range = hostport.substring(hostport.indexOf(":") + 1);
+ if (range.startsWith("-"))
+ ourfirstport = 0;
+ else if (range.indexOf("-") == -1)
+ ourfirstport = Integer.parseInt(range);
+ else
+ ourfirstport =
+ Integer.parseInt(range.substring(0, range.indexOf("-")));
+
+ if (range.endsWith("-"))
+ ourlastport = 65535;
+ else if (range.indexOf("-") == -1)
+ ourlastport = Integer.parseInt(range);
+ else
+ ourlastport =
+ Integer.parseInt(range.
+ substring(range.indexOf("-") + 1,
+ range.length()));
}
// Get theirs
if (p.hostport.indexOf(":") == -1)
{
- theirfirstport = 0;
- ourlastport = 65535;
+ theirfirstport = 0;
+ ourlastport = 65535;
}
else
{
- // This will dump if hostport if all sorts of bad data was passed to
- // the constructor
- String range = p.hostport.substring(hostport.indexOf(":") + 1);
- if (range.startsWith("-"))
- theirfirstport = 0;
- else if (range.indexOf("-") == -1)
- theirfirstport = Integer.parseInt(range);
- else
- theirfirstport =
- Integer.parseInt(range.substring(0, range.indexOf("-")));
-
- if (range.endsWith("-"))
- theirlastport = 65535;
- else if (range.indexOf("-") == -1)
- theirlastport = Integer.parseInt(range);
- else
- theirlastport =
- Integer.parseInt(range.
- substring(range.indexOf("-") + 1,
- range.length()));
+ // This will dump if hostport if all sorts of bad data was passed to
+ // the constructor
+ String range = p.hostport.substring(hostport.indexOf(":") + 1);
+ if (range.startsWith("-"))
+ theirfirstport = 0;
+ else if (range.indexOf("-") == -1)
+ theirfirstport = Integer.parseInt(range);
+ else
+ theirfirstport =
+ Integer.parseInt(range.substring(0, range.indexOf("-")));
+
+ if (range.endsWith("-"))
+ theirlastport = 65535;
+ else if (range.indexOf("-") == -1)
+ theirlastport = Integer.parseInt(range);
+ else
+ theirlastport =
+ Integer.parseInt(range.
+ substring(range.indexOf("-") + 1,
+ range.length()));
}
// Now check them
@@ -361,17 +361,17 @@
String ourcanonical = null, theircanonical = null;
try
{
- ourcanonical = InetAddress.getByName(ourhost).getHostName();
- theircanonical = InetAddress.getByName(theirhost).getHostName();
+ ourcanonical = InetAddress.getByName(ourhost).getHostName();
+ theircanonical = InetAddress.getByName(theirhost).getHostName();
}
catch (UnknownHostException e)
{
- // Who didn't resolve? Just assume current address is canonical enough
- // Is this ok to do?
- if (ourcanonical == null)
- ourcanonical = ourhost;
- if (theircanonical == null)
- theircanonical = theirhost;
+ // Who didn't resolve? Just assume current address is canonical enough
+ // Is this ok to do?
+ if (ourcanonical == null)
+ ourcanonical = ourhost;
+ if (theircanonical == null)
+ theircanonical = theirhost;
}
if (ourcanonical.equals(theircanonical))
@@ -380,9 +380,9 @@
// Well, last chance. Try for a wildcard
if (ourhost.indexOf("*.") != -1)
{
- String wild_domain = ourhost.substring(ourhost.indexOf("*" + 1));
- if (theircanonical.endsWith(wild_domain))
- return (true);
+ String wild_domain = ourhost.substring(ourhost.indexOf("*" + 1));
+ if (theircanonical.endsWith(wild_domain))
+ return (true);
}
// Didn't make it
--- /home/mkoch/src/gcc-cvs/libjava/java/net/URLDecoder.java 2002-11-04 15:00:22.000000000 +0100
+++ /home/mkoch/src/gcc-work/libjava/java/net/URLDecoder.java 2003-02-11 13:42:43.000000000 +0100
@@ -82,12 +82,12 @@
{
try
{
- return decode(s, "UTF-8");
+ return decode(s, "UTF-8");
}
catch (UnsupportedEncodingException uee)
{
- // Should never happen since UTF-8 encoding should always be supported
- return s;
+ // Should never happen since UTF-8 encoding should always be supported
+ return s;
}
}