changeset in /hg/icedtea6: Add a few additional fixes discovered...
Andrew John Hughes
ahughes at redhat.com
Tue Feb 3 04:14:00 PST 2009
changeset 8e91de51da9e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8e91de51da9e
description:
Add a few additional fixes discovered when doing a full build.
2009-01-27 Andrew John Hughes <ahughes at redhat.com>
* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java:
(positionSBC(long)): Renamed from position(long).
(truncateSBC(long)): Likewise.
* overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java:
Same as for FileChannel, prevents conflict with versions in java.nio.channel.FileChannel.
* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java,
* overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java:
Add missing imports.
* patches/icedtea-nio2.patch:
(FileChannelImpl.positionSBC(long)): Added, simply calls position(long).
(FileChannelImpl.truncateSBC(long)): Likewise.
diffstat:
6 files changed, 51 insertions(+), 8 deletions(-)
ChangeLog | 14 +++++
overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java | 4 -
overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java | 4 -
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java | 10 +++-
overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java | 3 -
patches/icedtea-nio2.patch | 24 +++++++++-
diffs (140 lines):
diff -r 514ec9ce7cae -r 8e91de51da9e ChangeLog
--- a/ChangeLog Mon Jan 26 23:12:40 2009 +0000
+++ b/ChangeLog Tue Jan 27 11:54:08 2009 +0000
@@ -1,3 +1,17 @@ 2009-01-26 Andrew John Hughes <ahughes
+2009-01-27 Andrew John Hughes <ahughes at redhat.com>
+
+ * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java:
+ (positionSBC(long)): Renamed from position(long).
+ (truncateSBC(long)): Likewise.
+ * overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java:
+ Same as for FileChannel, prevents conflict with versions in java.nio.channel.FileChannel.
+ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java,
+ * overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java:
+ Add missing imports.
+ * patches/icedtea-nio2.patch:
+ (FileChannelImpl.positionSBC(long)): Added, simply calls position(long).
+ (FileChannelImpl.truncateSBC(long)): Likewise.
+
2009-01-26 Andrew John Hughes <ahughes at redhat.com>
* overlays/nio2/openjdk/jdk/src/share/classes/sun/nio/ch/AsynchronousFileLockImpl.java,
diff -r 514ec9ce7cae -r 8e91de51da9e overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java
--- a/overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java Mon Jan 26 23:12:40 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/FileChannel.java Tue Jan 27 11:54:08 2009 +0000
@@ -369,7 +369,7 @@ public abstract class FileChannel
* @throws IOException
* If some other I/O error occurs
*/
- public abstract FileChannel position(long newPosition) throws IOException;
+ public abstract FileChannel positionSBC(long newPosition) throws IOException;
/**
* Truncates this channel's file to the given size.
@@ -398,7 +398,7 @@ public abstract class FileChannel
* @throws IOException
* If some other I/O error occurs
*/
- public abstract FileChannel truncate(long size) throws IOException;
+ public abstract FileChannel truncateSBC(long size) throws IOException;
}
diff -r 514ec9ce7cae -r 8e91de51da9e overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java
--- a/overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java Mon Jan 26 23:12:40 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/share/classes/org/classpath/icedtea/java/nio/channels/SeekableByteChannel.java Tue Jan 27 11:54:08 2009 +0000
@@ -124,7 +124,7 @@ public interface SeekableByteChannel
* @throws IOException
* If some other I/O error occurs
*/
- SeekableByteChannel position(long newPosition) throws IOException;
+ SeekableByteChannel positionSBC(long newPosition) throws IOException;
/**
* Returns the current size of entity to which this channel is connected.
@@ -166,5 +166,5 @@ public interface SeekableByteChannel
* @throws IOException
* If some other I/O error occurs
*/
- SeekableByteChannel truncate(long size) throws IOException;
+ SeekableByteChannel truncateSBC(long size) throws IOException;
}
diff -r 514ec9ce7cae -r 8e91de51da9e overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java Mon Jan 26 23:12:40 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java Tue Jan 27 11:54:08 2009 +0000
@@ -25,10 +25,16 @@
package sun.nio.ch;
-import java.nio.channels.*;
import java.util.concurrent.ExecutorService;
-import java.net.ProtocolFamily;
import java.io.IOException;
+
+import org.classpath.icedtea.java.net.ProtocolFamily;
+
+import org.classpath.icedtea.java.nio.channels.AsynchronousChannelGroup;
+import org.classpath.icedtea.java.nio.channels.AsynchronousDatagramChannel;
+import org.classpath.icedtea.java.nio.channels.AsynchronousSocketChannel;
+import org.classpath.icedtea.java.nio.channels.AsynchronousServerSocketChannel;
+import org.classpath.icedtea.java.nio.channels.IllegalChannelGroupException;
import org.classpath.icedtea.java.nio.channels.spi.AsynchronousChannelProvider;
diff -r 514ec9ce7cae -r 8e91de51da9e overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java
--- a/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java Mon Jan 26 23:12:40 2009 +0000
+++ b/overlays/nio2/openjdk/jdk/src/solaris/classes/sun/nio/ch/SolarisEventPort.java Tue Jan 27 11:54:08 2009 +0000
@@ -25,10 +25,11 @@
package sun.nio.ch;
-import java.nio.channels.spi.AsynchronousChannelProvider;
import java.util.concurrent.RejectedExecutionException;
import java.io.IOException;
import sun.misc.Unsafe;
+
+import org.classpath.icedtea.java.nio.channels.spi.AsynchronousChannelProvider;
/**
* AsynchronousChannelGroup implementation based on the Solaris 10 event port
diff -r 514ec9ce7cae -r 8e91de51da9e patches/icedtea-nio2.patch
--- a/patches/icedtea-nio2.patch Mon Jan 26 23:12:40 2009 +0000
+++ b/patches/icedtea-nio2.patch Tue Jan 27 11:54:08 2009 +0000
@@ -1372,7 +1372,7 @@ diff -Nru openjdk.orig/jdk/src/share/cla
}
diff -Nru openjdk.orig/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java openjdk/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java
--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2009-01-20 13:37:15.000000000 +0000
-+++ openjdk/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2009-01-20 13:45:52.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/nio/ch/FileChannelImpl.java 2009-01-27 02:33:08.000000000 +0000
@@ -32,8 +32,15 @@
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -1399,6 +1399,28 @@ diff -Nru openjdk.orig/jdk/src/share/cla
public class FileChannelImpl
extends FileChannel
+@@ -316,6 +324,10 @@
+ }
+ }
+
++ public FileChannel positionSBC(long newPosition) throws IOException {
++ return position(newPosition);
++ }
++
+ public long size() throws IOException {
+ ensureOpen();
+ synchronized (positionLock) {
+@@ -386,6 +398,10 @@
+ }
+ }
+
++ public FileChannel truncateSBC(long size) throws IOException {
++ return truncate(size);
++ }
++
+ public void force(boolean metaData) throws IOException {
+ ensureOpen();
+ int rv = -1;
diff -Nru openjdk.orig/jdk/src/share/classes/sun/nio/ch/Net.java openjdk/jdk/src/share/classes/sun/nio/ch/Net.java
--- openjdk.orig/jdk/src/share/classes/sun/nio/ch/Net.java 2009-01-15 17:37:33.000000000 +0000
+++ openjdk/jdk/src/share/classes/sun/nio/ch/Net.java 2009-01-19 23:21:37.000000000 +0000
More information about the distro-pkg-dev
mailing list