diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2010-11-08 08:14:04 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2010-11-08 08:14:04 +0000 |
| commit | 92b914da21d0b47c3e2b5666b73a69a31be00493 (patch) | |
| tree | 6fdfc3549f26fa3505c3a3e188eafc1cf413090f /java/openjdk7/files/patch-zzz-nio-kqueue | |
| parent | - Update to 2.4.7. (diff) | |
. Update to Build 117.
. Temporarily disable a previous openjdk7 install as a bootstrap since the
previous version won't compile this one.
Notes
Notes:
svn path=/head/; revision=264230
Diffstat (limited to 'java/openjdk7/files/patch-zzz-nio-kqueue')
| -rw-r--r-- | java/openjdk7/files/patch-zzz-nio-kqueue | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/java/openjdk7/files/patch-zzz-nio-kqueue b/java/openjdk7/files/patch-zzz-nio-kqueue index 61c4783237bb..d72f874e20f0 100644 --- a/java/openjdk7/files/patch-zzz-nio-kqueue +++ b/java/openjdk7/files/patch-zzz-nio-kqueue @@ -313,7 +313,7 @@ } --- jdk/src/solaris/classes/sun/nio/ch/KqueueSelectorImpl.java (revision 0) +++ jdk/src/solaris/classes/sun/nio/ch/KqueueSelectorImpl.java (revision 16) -@@ -0,0 +1,204 @@ +@@ -0,0 +1,203 @@ +/* + * scratched by davidxu@freebsd.org + */ @@ -362,10 +362,9 @@ + */ + KqueueSelectorImpl(SelectorProvider sp) { + super(sp); -+ int[] fdes = new int[2]; -+ IOUtil.initPipe(fdes, false); -+ fd0 = fdes[0]; -+ fd1 = fdes[1]; ++ long pipeFds = IOUtil.makePipe(false); ++ fd0 = (int) (pipeFds >>> 32); ++ fd1 = (int) pipeFds; + kqueueWrapper = new KqueueArrayWrapper(); + totalChannels = 1; + kqueueWrapper.initInterrupt(fd0, fd1); @@ -458,7 +457,7 @@ + selectedKeys = null; + + // Deregister channels -+ Iterator i = keys.iterator(); ++ Iterator<SelectionKey> i = keys.iterator(); + while (i.hasNext()) { + SelectionKeyImpl ski = (SelectionKeyImpl)i.next(); + deregister(ski); |