# HG changeset patch
# User chegar
# Date 1204889432 0
# Node ID 216899854ed5d1a56e0ae075b74f5cc997295dcb
# Parent  c2d2c408d6ed0cb5291f2c2cd1fe352fdcef37d2
6615656: Removed unimplemented java.net methods
Reviewed-by: jccollet

diff -r c2d2c408d6ed -r 216899854ed5 jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java
--- a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	Fri Mar 07 09:57:22 2008 +0000
+++ b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java	Fri Mar 07 11:30:32 2008 +0000
@@ -664,7 +664,6 @@
     abstract void socketSetOption(int cmd, boolean on, Object value)
         throws SocketException;
     abstract int socketGetOption(int opt, Object iaContainerObj) throws SocketException;
-    abstract int socketGetOption1(int opt, Object iaContainerObj, FileDescriptor fd) throws SocketException;
     abstract void socketSendUrgentData(int data)
         throws IOException;
 
diff -r c2d2c408d6ed -r 216899854ed5 jdk/src/share/classes/java/net/NetworkInterface.java
--- a/jdk/src/share/classes/java/net/NetworkInterface.java	Fri Mar 07 09:57:22 2008 +0000
+++ b/jdk/src/share/classes/java/net/NetworkInterface.java	Fri Mar 07 11:30:32 2008 +0000
@@ -425,8 +425,6 @@
         return virtual;
     }
 
-    private native static long getSubnet0(String name, int ind) throws SocketException;
-    private native static Inet4Address getBroadcast0(String name, int ind) throws SocketException;
     private native static boolean isUp0(String name, int ind) throws SocketException;
     private native static boolean isLoopback0(String name, int ind) throws SocketException;
     private native static boolean supportsMulticast0(String name, int ind) throws SocketException;
diff -r c2d2c408d6ed -r 216899854ed5 jdk/src/solaris/classes/java/net/PlainSocketImpl.java
--- a/jdk/src/solaris/classes/java/net/PlainSocketImpl.java	Fri Mar 07 09:57:22 2008 +0000
+++ b/jdk/src/solaris/classes/java/net/PlainSocketImpl.java	Fri Mar 07 11:30:32 2008 +0000
@@ -76,9 +76,6 @@
 
     native int socketGetOption(int opt, Object iaContainerObj) throws SocketException;
 
-    native int socketGetOption1(int opt, Object iaContainerObj, FileDescriptor fd)
-        throws SocketException;
-
     native void socketSendUrgentData(int data) throws IOException;
 
 }
diff -r c2d2c408d6ed -r 216899854ed5 jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java
--- a/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java	Fri Mar 07 09:57:22 2008 +0000
+++ b/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java	Fri Mar 07 11:30:32 2008 +0000
@@ -218,9 +218,6 @@
         return value;
     }
 
-    int socketGetOption1(int opt, Object iaContainerObj, FileDescriptor fd)
-        throws SocketException {return 0;}   // un-implemented REMOVE
-
     void socketSendUrgentData(int data) throws IOException {
         int nativefd = checkAndReturnNativeFD();
         sendOOB(nativefd, data);
diff -r c2d2c408d6ed -r 216899854ed5 jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java
--- a/jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java	Fri Mar 07 09:57:22 2008 +0000
+++ b/jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java	Fri Mar 07 11:30:32 2008 +0000
@@ -199,8 +199,5 @@
 
     native int socketGetOption(int opt, Object iaContainerObj) throws SocketException;
 
-    native int socketGetOption1(int opt, Object iaContainerObj, FileDescriptor fd)
-        throws SocketException;
-
     native void socketSendUrgentData(int data) throws IOException;
 }