PORTREVISION=	1

--- jdk/src/solaris/native/java/net/bsd_close.c.orig	2012-08-10 17:31:31.000000000 +0000

+++ jdk/src/solaris/native/java/net/bsd_close.c	2013-01-18 18:36:37.000000000 +0000

@@ -29,7 +29,6 @@

 #include <pthread.h>

 #include <sys/types.h>

 #include <sys/socket.h>

-#include <sys/select.h>

 #include <sys/time.h>

 #include <sys/resource.h>

 #include <sys/uio.h>

@@ -340,13 +339,13 @@

 #endif

 /*

- * Wrapper for select(s, timeout). We are using select() on Mac OS due to Bug 7131399.

+ * Wrapper for poll(s, timeout).

  * Auto restarts with adjusted timeout if interrupted by

  * signal other than our wakeup signal.

  */

 int NET_Timeout(int s, long timeout) {

     long prevtime = 0, newtime;

-    struct timeval t, *tp = &t;

+    struct timeval t;

     fdEntry_t *fdEntry = getFdEntry(s);

     /*

@@ -361,35 +360,24 @@

      * Pick up current time as may need to adjust timeout

      */

     if (timeout > 0) {

-        /* Timed */

-        struct timeval now;

-        gettimeofday(&now, NULL);

-        prevtime = now.tv_sec * 1000  +  now.tv_usec / 1000;

-        t.tv_sec = timeout / 1000;

-        t.tv_usec = (timeout % 1000) * 1000;

-    } else if (timeout < 0) {

-        /* Blocking */

-        tp = 0;

-    } else {

-        /* Poll */

-        t.tv_sec = 0;

-        t.tv_usec = 0;

+        gettimeofday(&t, NULL);

+        prevtime = t.tv_sec * 1000  +  t.tv_usec / 1000;

     }

     for(;;) {

-        fd_set rfds;

+        struct pollfd pfd;

         int rv;

         threadEntry_t self;

         /*

-         * call select on the fd. If interrupted by our wakeup signal

+         * Poll the fd. If interrupted by our wakeup signal

          * errno will be set to EBADF.

          */

-        FD_ZERO(&rfds);

-        FD_SET(s, &rfds);

+        pfd.fd = s;

+        pfd.events = POLLIN | POLLERR;

         startOp(fdEntry, &self);

-        rv = select(s+1, &rfds, 0, 0, tp);

+        rv = poll(&pfd, 1, timeout);

         endOp(fdEntry, &self);

         /*

@@ -398,16 +386,13 @@

          */

         if (rv < 0 && errno == EINTR) {

             if (timeout > 0) {

-                struct timeval now;

-                gettimeofday(&now, NULL);

-                newtime = now.tv_sec * 1000  +  now.tv_usec / 1000;

+                gettimeofday(&t, NULL);

+                newtime = t.tv_sec * 1000  +  t.tv_usec / 1000;

                 timeout -= newtime - prevtime;

                 if (timeout <= 0) {

                     return 0;

                 }

                 prevtime = newtime;

-                t.tv_sec = timeout / 1000;

-                t.tv_usec = (timeout % 1000) * 1000;

             }

         } else {

             return rv;