Index: java/net/DatagramSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/DatagramSocket.java,v
retrieving revision 1.38
diff -u -b -B -r1.38 DatagramSocket.java
--- java/net/DatagramSocket.java	6 Feb 2004 09:13:24 -0000	1.38
+++ java/net/DatagramSocket.java	12 Feb 2004 16:36:54 -0000
@@ -798,7 +798,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    getImpl().setOption (SocketOptions.SO_REUSEADDR, new Boolean (on));
+    getImpl().setOption (SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
   }
 
   /**
@@ -837,7 +837,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    getImpl().setOption(SocketOptions.SO_BROADCAST, new Boolean(enable));
+    getImpl().setOption(SocketOptions.SO_BROADCAST, Boolean.valueOf(enable));
   }
 
   /**
Index: java/net/MulticastSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/MulticastSocket.java,v
retrieving revision 1.22
diff -u -b -B -r1.22 MulticastSocket.java
--- java/net/MulticastSocket.java	2 Dec 2003 10:50:56 -0000	1.22
+++ java/net/MulticastSocket.java	12 Feb 2004 16:36:54 -0000
@@ -255,7 +255,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    getImpl().setOption (SocketOptions.IP_MULTICAST_LOOP, new Boolean (disable));
+    getImpl().setOption (SocketOptions.IP_MULTICAST_LOOP, Boolean.valueOf(disable));
   }
 
   /**
Index: java/net/ServerSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/ServerSocket.java,v
retrieving revision 1.33
diff -u -b -B -r1.33 ServerSocket.java
--- java/net/ServerSocket.java	6 Feb 2004 09:13:24 -0000	1.33
+++ java/net/ServerSocket.java	12 Feb 2004 16:36:54 -0000
@@ -471,7 +471,7 @@
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
     
-    impl.setOption (SocketOptions.SO_REUSEADDR, new Boolean (on));
+    impl.setOption (SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
   }
 
   /**
Index: java/net/Socket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Socket.java,v
retrieving revision 1.41
diff -u -b -B -r1.41 Socket.java
--- java/net/Socket.java	6 Feb 2004 09:13:24 -0000	1.41
+++ java/net/Socket.java	12 Feb 2004 16:36:54 -0000
@@ -657,7 +657,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
     
-    getImpl().setOption(SocketOptions.TCP_NODELAY, new Boolean(on));
+    getImpl().setOption(SocketOptions.TCP_NODELAY, Boolean.valueOf(on));
   }
 
   /**
@@ -719,7 +719,7 @@
       }
     else
       {
-        getImpl().setOption(SocketOptions.SO_LINGER, new Boolean(false));
+        getImpl().setOption(SocketOptions.SO_LINGER, Boolean.valueOf(false));
       }
   }
 
@@ -784,7 +784,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
     
-    getImpl().setOption(SocketOptions.SO_OOBINLINE, new Boolean(on));
+    getImpl().setOption(SocketOptions.SO_OOBINLINE, Boolean.valueOf(on));
   }
 
   /**
@@ -975,7 +975,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
     
-    getImpl().setOption(SocketOptions.SO_KEEPALIVE, new Boolean(on));
+    getImpl().setOption(SocketOptions.SO_KEEPALIVE, Boolean.valueOf(on));
   }
 
   /**
@@ -1150,7 +1150,7 @@
    */
   public void setReuseAddress (boolean on) throws SocketException
   {
-    getImpl().setOption (SocketOptions.SO_REUSEADDR, new Boolean (on));
+    getImpl().setOption (SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
   }
 
   /**
Index: java/net/URLStreamHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLStreamHandler.java,v
retrieving revision 1.24
diff -u -b -B -r1.24 URLStreamHandler.java
--- java/net/URLStreamHandler.java	31 Dec 2003 08:44:39 -0000	1.24
+++ java/net/URLStreamHandler.java	12 Feb 2004 16:36:54 -0000
@@ -415,7 +415,7 @@
     InetAddress addr1 = getHostAddress (url1);
     InetAddress addr2 = getHostAddress (url2);
 
-    if (addr1 != null || addr2 != null)
+    if (addr1 != null && addr2 != null)
       return addr1.equals (addr2);
 
     String host1 = url1.getHost();
@@ -511,7 +511,7 @@
     int size = protocol.length() + host.length() + file.length() + 24;
     StringBuffer sb = new StringBuffer(size);
 
-    if (protocol != null && protocol.length() > 0)
+    if (protocol.length() != 0)
       {
 	sb.append(protocol);
 	sb.append(":");