Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 1372 invoked from network); 11 Dec 2008 13:13:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Dec 2008 13:13:11 -0000 Received: (qmail 13740 invoked by uid 500); 11 Dec 2008 13:13:24 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 13714 invoked by uid 500); 11 Dec 2008 13:13:23 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 13705 invoked by uid 99); 11 Dec 2008 13:13:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Dec 2008 05:13:23 -0800 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Dec 2008 13:13:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3184D238889D; Thu, 11 Dec 2008 05:12:48 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r725677 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/OSNetworkSystemLinux.c Date: Thu, 11 Dec 2008 13:12:47 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081211131248.3184D238889D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hindessm Date: Thu Dec 11 05:12:46 2008 New Revision: 725677 URL: http://svn.apache.org/viewvc?rev=725677&view=rev Log: Fixed selectRead on unix to return portlib error codes rather than system ones so that it is consistent with the windows selectRead implementation. 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=725677&r1=725676&r2=725677&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 Thu Dec 11 05:12:46 2008 @@ -71,6 +71,12 @@ my_pollfd.revents = 0; result = poll (&my_pollfd, 1, timeout); + if (result == 0) + return HYPORT_ERROR_SOCKET_TIMEOUT; + + if (result == -1) + return HYPORT_ERROR_SOCKET_OPFAILED; + return result; }