changeset 87:bf0750ece551

Merge
author chegar
date Fri, 07 Mar 2008 07:28:50 -0800
parents a9644392a939 b3387104155f
children 18d94f53bd30
files
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/windows/classes/java/net/PlainSocketImpl.java	Fri Mar 07 07:25:17 2008 -0800
+++ b/jdk/src/windows/classes/java/net/PlainSocketImpl.java	Fri Mar 07 07:28:50 2008 -0800
@@ -304,11 +304,6 @@
         return impl.socketGetOption(opt, iaContainerObj);
     }
 
-    int socketGetOption1(int opt, Object iaContainerObj, FileDescriptor fd)
-        throws SocketException {
-        return impl.socketGetOption1(opt, iaContainerObj, fd);
-    }
-
     void socketSendUrgentData(int data) throws IOException {
         impl.socketSendUrgentData(data);
     }