From b8383dba86319e0ce71af09484c5b6fd2321c4dc Mon Sep 17 00:00:00 2001 From: Chris Hegarty Date: Fri, 7 Mar 2008 11:30:32 +0000 Subject: [PATCH] 6615656: Removed unimplemented java.net methods Reviewed-by: jccollet --- jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java | 1 - jdk/src/share/classes/java/net/NetworkInterface.java | 2 -- jdk/src/solaris/classes/java/net/PlainSocketImpl.java | 3 --- jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java | 3 --- jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java | 3 --- 5 files changed, 12 deletions(-) diff --git a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java index ffc23824b61..41c39f0e15f 100644 --- a/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java +++ b/jdk/src/share/classes/java/net/AbstractPlainSocketImpl.java @@ -664,7 +664,6 @@ abstract class AbstractPlainSocketImpl extends SocketImpl 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 --git a/jdk/src/share/classes/java/net/NetworkInterface.java b/jdk/src/share/classes/java/net/NetworkInterface.java index 8b2899c48d9..0ce3a8d580b 100644 --- a/jdk/src/share/classes/java/net/NetworkInterface.java +++ b/jdk/src/share/classes/java/net/NetworkInterface.java @@ -425,8 +425,6 @@ public final class NetworkInterface { 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 --git a/jdk/src/solaris/classes/java/net/PlainSocketImpl.java b/jdk/src/solaris/classes/java/net/PlainSocketImpl.java index 113bcb0183e..25e2bab81f5 100644 --- a/jdk/src/solaris/classes/java/net/PlainSocketImpl.java +++ b/jdk/src/solaris/classes/java/net/PlainSocketImpl.java @@ -76,9 +76,6 @@ class PlainSocketImpl extends AbstractPlainSocketImpl 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 --git a/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java b/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java index 116046603f8..4e92df7f687 100644 --- a/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java +++ b/jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java @@ -218,9 +218,6 @@ class DualStackPlainSocketImpl extends AbstractPlainSocketImpl 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 --git a/jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java b/jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java index 9475bd3f7a1..13851124b32 100644 --- a/jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java +++ b/jdk/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java @@ -199,8 +199,5 @@ class TwoStacksPlainSocketImpl extends AbstractPlainSocketImpl 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; }