You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2008/12/03 23:28:44 UTC
svn commit: r723103 - in
/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni:
shared/OSNetworkSystem.c shared/OSNetworkSystem.h unix/exports.txt
Author: tellison
Date: Wed Dec 3 14:28:44 2008
New Revision: 723103
URL: http://svn.apache.org/viewvc?rev=723103&view=rev
Log:
Remove unused native code for createSocket.
Remove call to set SO_REUSEADDR on Linux.
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSNetworkSystem.c
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSNetworkSystem.h
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/exports.txt
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSNetworkSystem.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSNetworkSystem.c?rev=723103&r1=723102&r2=723103&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSNetworkSystem.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSNetworkSystem.c Wed Dec 3 14:28:44 2008
@@ -293,18 +293,6 @@
HARMONY_CACHE_SET(env, FID_java_net_DatagramPacket_port, fid);
}
-/*
- * Class: org_apache_harmony_luni_platform_OSNetworkSystem
- * Method: createSocket
- * Signature: (Ljava/io/FileDescriptor;Z)V
- */
-JNIEXPORT void JNICALL
-Java_org_apache_harmony_luni_platform_OSNetworkSystem_createSocket
- (JNIEnv * env, jobject thiz, jobject fd, jboolean preferIPv4Stack)
-{
- createSocket(env, fd, HYSOCK_STREAM, preferIPv4Stack);
-}
-
/*
* Class: org_apache_harmony_luni_platform_OSNetworkSystem
@@ -315,14 +303,7 @@
Java_org_apache_harmony_luni_platform_OSNetworkSystem_createStreamSocket
(JNIEnv * env, jobject thiz, jobject thisObjFD, jboolean preferIPv4Stack)
{
- hysocket_t socketP;
-
createSocket(env, thisObjFD, HYSOCK_STREAM, preferIPv4Stack);
- socketP =
- (hysocket_t) getJavaIoFileDescriptorContentsAsAPointer(env, thisObjFD);
-
- /* Sets HY_SO_REUSEADDR = TRUE on Linux only */
- setPlatformBindOptions(env, socketP);
}
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSNetworkSystem.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSNetworkSystem.h?rev=723103&r1=723102&r2=723103&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSNetworkSystem.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/OSNetworkSystem.h Wed Dec 3 14:28:44 2008
@@ -154,15 +154,6 @@
/*
* Class: org.apache.harmony.luni.platform.OSNetworkSystem
- * Method: createSocket
- * Signature: (Ljava/io/FileDescriptor;Z)V
- * Throws: java.io.IOException
- */
-JNIEXPORT void JNICALL Java_org_apache_harmony_luni_platform_OSNetworkSystem_createSocket
- (JNIEnv *, jobject, jobject, jboolean);
-
-/*
- * Class: org.apache.harmony.luni.platform.OSNetworkSystem
* Method: createStreamSocket
* Signature: (Ljava/io/FileDescriptor;Z)V
* Throws: java.net.SocketException
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/exports.txt?rev=723103&r1=723102&r2=723103&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/exports.txt (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/exports.txt Wed Dec 3 14:28:44 2008
@@ -185,7 +185,6 @@
Java_org_apache_harmony_luni_platform_OSMemory_setFloat
Java_org_apache_harmony_luni_platform_OSMemory_getDouble
Java_org_apache_harmony_luni_platform_OSMemory_setDouble
-Java_org_apache_harmony_luni_platform_OSNetworkSystem_createSocket
Java_org_apache_harmony_luni_platform_OSNetworkSystem_createDatagramSocket
Java_org_apache_harmony_luni_platform_OSNetworkSystem_read
Java_org_apache_harmony_luni_platform_OSNetworkSystem_readDirect