Mercurial > hg > release > icedtea-1.9

view patches/icedtea-pr261.patch @ 1721:e6d83e63e8e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to b50 (02). Now builds using --with-icedtea. 2009-03-17 Andrew John Hughes <ahughes@redhat.com> * overlays/nio2/openjdk/jdk/src/share/classes/java/nio/file/attribute/NamedAttributeView.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java, * overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/fs/AbstractNamedAttributeView.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxNamedAttributeView.java, * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/fs/SolarisNamedAttributeView.java, * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/fs/WindowsNamedAttributeView.java, * overlays/nio2/openjdk/jdk/test/java/nio/file/attribute/NamedAttributeView/Basic.java: Removed; in b50 (renamed as in b99). * patches/security/icedtea-6721753.patch: Removed; in b50. * Makefile.am: Remove security patch. * overlays/nio2/openjdk/jdk/src/share/classes/java/io/Inputs.java, * overlays/nio2/openjdk/jdk/src/share/classes/java/io/Outputs.java, * overlays/nio2/openjdk/jdk/src/share/demo/nio/ZipFileSystem/com/sun/nio/zipfs/ZipFileSystem.java: Updated to nio2 b99. * patches/icedtea-nio2.patch: Recreated against b50. * patches/icedtea-pr261.patch: Likewise.
author Andrew John Hughes <ahughes@redhat.com>
date Tue, 17 Mar 2009 00:44:07 +0000
parents 983ed89e8dd3
children
line wrap: on
line source

diff -Nru openjdk.orig/jdk/make/java/nio/FILES_java.gmk openjdk/jdk/make/java/nio/FILES_java.gmk
--- openjdk.orig/jdk/make/java/nio/FILES_java.gmk	2009-03-05 08:28:24.000000000 +0000
+++ openjdk/jdk/make/java/nio/FILES_java.gmk	2009-03-06 17:57:56.000000000 +0000
@@ -39,6 +39,7 @@
 	java/nio/channels/AsynchronousServerSocketChannel.java \
 	java/nio/channels/AsynchronousSocketChannel.java \
 	java/nio/channels/ByteChannel.java \
+	java/nio/channels/CancelledKeyException.java \
 	java/nio/channels/Channel.java \
 	java/nio/channels/Channels.java \
 	java/nio/channels/CompletionHandler.java \
@@ -51,6 +52,7 @@
 	java/nio/channels/MembershipKey.java \
 	java/nio/channels/MulticastChannel.java \
 	java/nio/channels/NetworkChannel.java \
+	java/nio/channels/Pipe.java \
 	java/nio/channels/ReadableByteChannel.java \
 	java/nio/channels/ScatteringByteChannel.java \
 	java/nio/channels/SeekableByteChannel.java \
diff -Nru openjdk.orig/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile
--- openjdk.orig/jdk/make/java/nio/Makefile	2009-03-05 08:28:24.000000000 +0000
+++ openjdk/jdk/make/java/nio/Makefile	2009-03-06 18:00:27.000000000 +0000
@@ -183,6 +183,9 @@
 ifeq ($(PLATFORM), linux)
 FILES_java += \
         sun/nio/ch/AbstractPollSelectorImpl.java \
+	sun/nio/ch/DevPollArrayWrapper.java \
+	sun/nio/ch/DevPollSelectorImpl.java \
+	sun/nio/ch/DevPollSelectorProvider.java \
 	sun/nio/ch/EPoll.java \
 	sun/nio/ch/EPollArrayWrapper.java \
 	sun/nio/ch/EPollPort.java \
@@ -242,6 +245,7 @@
 	UnixNativeDispatcher.c
 
 FILES_export += \
+ 	sun/nio/ch/DevPollArrayWrapper.java \
 	sun/nio/ch/EPoll.java \
         sun/nio/ch/EPollArrayWrapper.java \
 	sun/nio/ch/EPollPort.java \