You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@harmony.apache.org by hi...@apache.org on 2010/03/22 15:03:22 UTC

svn commit: r926091 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c

Author: hindessm
Date: Mon Mar 22 14:03:22 2010
New Revision: 926091

URL: http://svn.apache.org/viewvc?rev=926091&view=rev
Log:
Apply fix only from "[#HARMONY-6479] GPF creating ServerSocket when no more
file handles available".

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c?rev=926091&r1=926090&r2=926091&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c Mon Mar 22 14:03:22 2010
@@ -109,6 +109,11 @@ Java_org_apache_harmony_luni_platform_OS
 
   createSocket(env, thisObjFD, HYSOCK_STREAM, preferIPv4Stack);
 
+  /* Check if any exception occurred creating the socket */
+  if ((*env)->ExceptionCheck(env)) {
+    return;
+  }
+
   /* Also sets HY_SO_REUSEADDR = TRUE on Linux only */
   socketP =
     (hysocket_t) getJavaIoFileDescriptorContentsAsAPointer(env, thisObjFD);