aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/net/MulticastSocket.java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java/net/MulticastSocket.java')
-rw-r--r--libjava/java/net/MulticastSocket.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/libjava/java/net/MulticastSocket.java b/libjava/java/net/MulticastSocket.java
index 03a6e6b..6759e3b 100644
--- a/libjava/java/net/MulticastSocket.java
+++ b/libjava/java/net/MulticastSocket.java
@@ -76,7 +76,7 @@ public class MulticastSocket extends DatagramSocket
// JDK1.2
public void setTimeToLive(int ttl) throws IOException
{
- if (ttl < 0 || ttl > 255)
+ if (ttl <= 0 || ttl > 255)
throw new IllegalArgumentException("Invalid ttl: " + ttl);
impl.setTimeToLive(ttl);
@@ -84,6 +84,10 @@ public class MulticastSocket extends DatagramSocket
public void joinGroup(InetAddress mcastaddr) throws IOException
{
+ // FIXME: We can't currently rely on NullPointerException being
+ // thrown when we invoke a method on a null object.
+ if (mcastaddr == null)
+ throw new NullPointerException("Null address");
if (! mcastaddr.isMulticastAddress())
throw new IOException("Not a Multicast address");
@@ -96,6 +100,10 @@ public class MulticastSocket extends DatagramSocket
public void leaveGroup(InetAddress mcastaddr) throws IOException
{
+ // FIXME: We can't currently rely on NullPointerException being
+ // thrown when we invoke a method on a null object.
+ if (mcastaddr == null)
+ throw new NullPointerException("Null address");
if (! mcastaddr.isMulticastAddress())
throw new IOException("Not a Multicast address");