FYI: java.net - some fixes

[Michael Koch <konqueror at gmx dot de>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,


I commited the attached patch to add some @deprecated and replace one 
SecurityManager.checkMulticast with SecurityManager.checkPermission.

Tom: I think this is for 3.3 too.


Michael
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+YmXuWSOgCCdjSDsRAlq5AJwL0czcVwRodVwsUShft32gEd3ipwCfUEo0
viGZMY6qIDqPPpDMqfc6q3w=
=MujN
-----END PGP SIGNATURE-----

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1756
diff -u -r1.1756 ChangeLog
--- ChangeLog	2 Mar 2003 19:45:52 -0000	1.1756
+++ ChangeLog	2 Mar 2003 20:10:44 -0000
@@ -1,5 +1,17 @@
 2003-03-02  Michael Koch  <konqueror at gmx dot de>
 
+	* java/net/HttpURLConnection.java
+	(HTTP_SERVER_ERROR): Deprecated.
+	* java/net/MulticastSocket.java
+	(send): Replaced checkMulticast with appropriate checkPermission call,
+	deprecated.
+	* java/net/URLDecoder.java
+	(decode): Deprecated.
+	* java/net/URLEncoder.java
+	(encode): Deprecated.
+
+2003-03-02  Michael Koch  <konqueror at gmx dot de>
+
 	* javax/swing/text/Caret.java
 	(getMagicCaretPosition): Fixed typo in method name.
 	* javax/swing/text/DefaultCaret.java
Index: java/net/HttpURLConnection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/HttpURLConnection.java,v
retrieving revision 1.10
diff -u -r1.10 HttpURLConnection.java
--- java/net/HttpURLConnection.java	3 Jan 2003 00:49:31 -0000	1.10
+++ java/net/HttpURLConnection.java	2 Mar 2003 20:10:44 -0000
@@ -242,6 +242,8 @@
 
   /**
    * This error code indicates that some sort of server error occurred.
+   *
+   * @deprecated
    */
   public static final int HTTP_SERVER_ERROR    = 500;
 
Index: java/net/MulticastSocket.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/MulticastSocket.java,v
retrieving revision 1.18
diff -u -r1.18 MulticastSocket.java
--- java/net/MulticastSocket.java	16 Jan 2003 08:01:27 -0000	1.18
+++ java/net/MulticastSocket.java	2 Mar 2003 20:10:44 -0000
@@ -426,17 +426,21 @@
    * @exception IOException If an error occurs
    * @exception SecurityException If a security manager exists and its
    * checkConnect or checkMulticast method doesn't allow the operation
+   *
+   * @deprecated
    */
   public synchronized void send(DatagramPacket p, byte ttl) throws IOException
   {
     SecurityManager s = System.getSecurityManager();
     if (s != null)
       {
-	InetAddress addr = p.getAddress();
-	if (addr.isMulticastAddress())
-	  s.checkMulticast(addr, ttl);
-	else
-	  s.checkConnect(addr.getHostAddress(), p.getPort());
+        InetAddress addr = p.getAddress();
+        if (addr.isMulticastAddress())
+          s.checkPermission (new SocketPermission
+                             (addr.getHostName () + p.getPort (),
+                              "accept,connect"));
+        else
+          s.checkConnect(addr.getHostAddress(), p.getPort());
       }
 
     int oldttl = impl.getTimeToLive();
Index: java/net/URLDecoder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/URLDecoder.java,v
retrieving revision 1.9
diff -u -r1.9 URLDecoder.java
--- java/net/URLDecoder.java	13 Feb 2003 07:33:40 -0000	1.9
+++ java/net/URLDecoder.java	2 Mar 2003 20:10:44 -0000
@@ -77,6 +77,8 @@
    * @param s the String to convert
    *
    * @return the converted String
+   *
+   * @deprecated
    */
   public static String decode(String s)
   {
Index: java/net/URLEncoder.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/URLEncoder.java,v
retrieving revision 1.7
diff -u -r1.7 URLEncoder.java
--- java/net/URLEncoder.java	3 Nov 2002 20:27:31 -0000	1.7
+++ java/net/URLEncoder.java	2 Mar 2003 20:10:44 -0000
@@ -71,6 +71,8 @@
    * @param s The String to convert
    *
    * @return The converted String
+   *
+   * @deprecated
    */
   public static String encode(String s)
   {