stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Chris Hegarty 2010-06-28 15:06:24 +01:00
commit fba8695a1c
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/make/common/Release.gmk
View File

@ -549,7 +549,6 @@ DIRDIFF_JARFILE = $(BUILDTOOLJARDIR)/dirdiff.jar
###################################################### ######################################################
# List of directories in classes directory that should NOT be in rt.jar # List of directories in classes directory that should NOT be in rt.jar
# sun/nio/cs/ext/ will go into charsets.jar
###################################################### ######################################################
NOT_RT_JAR_LIST = $(ABS_TEMPDIR)/not_rt_jar.list NOT_RT_JAR_LIST = $(ABS_TEMPDIR)/not_rt_jar.list
@ -572,7 +571,6 @@ $(NOT_RT_JAR_LIST): FRC
$(ECHO) "META-INF/services/com.sun.tools.xjc.Plugin" >> $@ $(ECHO) "META-INF/services/com.sun.tools.xjc.Plugin" >> $@
$(ECHO) "com/sun/tools/" >> $@ $(ECHO) "com/sun/tools/" >> $@
$(ECHO) "sun/jvmstat/" >> $@ $(ECHO) "sun/jvmstat/" >> $@
$(ECHO) "sun/nio/cs/ext/" >> $@
$(ECHO) "sun/rmi/rmic/" >> $@ $(ECHO) "sun/rmi/rmic/" >> $@
$(ECHO) "sun/tools/asm/" >> $@ $(ECHO) "sun/tools/asm/" >> $@
$(ECHO) "sun/tools/java/" >> $@ $(ECHO) "sun/tools/java/" >> $@

58
jdk/test/java/nio/channels/FileChannel/Transfer.java
View File

@ -25,7 +25,6 @@
* @bug 4434723 4482726 4559072 4638365 4795550 5081340 5103988 6253145 * @bug 4434723 4482726 4559072 4638365 4795550 5081340 5103988 6253145
* @summary Test FileChannel.transferFrom and transferTo * @summary Test FileChannel.transferFrom and transferTo
* @library .. * @library ..
* @run main/timeout=240 Transfer
*/ */
import java.io.*; import java.io.*;
@ -33,6 +32,8 @@ import java.net.*;
import java.nio.*; import java.nio.*;
import java.nio.channels.*; import java.nio.channels.*;
import java.nio.channels.spi.SelectorProvider; import java.nio.channels.spi.SelectorProvider;
import java.nio.file.StandardOpenOption;
import java.nio.file.FileAlreadyExistsException;
import java.util.Random; import java.util.Random;
@ -262,23 +263,30 @@ public class Transfer {
// Test transferFrom with large file // Test transferFrom with large file
public static void xferTest05() throws Exception { public static void xferTest05() throws Exception {
// Linux can't handle the really large file sizes for a
// truncate or a positional write
String osName = System.getProperty("os.name");
if (osName.startsWith("Linux"))
return;
// Create a source file & large sink file for the test // Create a source file & large sink file for the test
File source = File.createTempFile("blech", null); File source = File.createTempFile("blech", null);
source.deleteOnExit(); source.deleteOnExit();
initTestFile(source, 100); initTestFile(source, 100);
File sink = File.createTempFile("sink", null); // Create the sink file as a sparse file if possible
File sink = null;
FileChannel fc = null;
while (fc == null) {
sink = File.createTempFile("sink", null);
// re-create as a sparse file
sink.toPath().delete();
try {
fc = FileChannel.open(sink.toPath(),
StandardOpenOption.CREATE_NEW,
StandardOpenOption.WRITE,
StandardOpenOption.SPARSE);
} catch (FileAlreadyExistsException ignore) {
// someone else got it
}
}
sink.deleteOnExit(); sink.deleteOnExit();
long testSize = ((long)Integer.MAX_VALUE) * 2; long testSize = ((long)Integer.MAX_VALUE) * 2;
RandomAccessFile raf = new RandomAccessFile(sink, "rw");
FileChannel fc = raf.getChannel();
try { try {
fc.write(ByteBuffer.wrap("Use the source!".getBytes()), fc.write(ByteBuffer.wrap("Use the source!".getBytes()),
testSize - 40); testSize - 40);
@ -288,24 +296,26 @@ public class Transfer {
return; return;
} finally { } finally {
fc.close(); fc.close();
raf.close();
} }
// Get new channels for the source and sink and attempt transfer // Get new channels for the source and sink and attempt transfer
FileInputStream fis = new FileInputStream(source); FileChannel sourceChannel = new FileInputStream(source).getChannel();
FileChannel sourceChannel = fis.getChannel(); try {
FileChannel sinkChannel = new RandomAccessFile(sink, "rw").getChannel();
raf = new RandomAccessFile(sink, "rw"); try {
FileChannel sinkChannel = raf.getChannel(); long bytesWritten = sinkChannel.transferFrom(sourceChannel,
testSize - 40, 10);
long bytesWritten = sinkChannel.transferFrom(sourceChannel, if (bytesWritten != 10) {
testSize - 40, 10); throw new RuntimeException("Transfer test 5 failed " +
if (bytesWritten != 10) { bytesWritten);
throw new RuntimeException("Transfer test 5 failed " + }
bytesWritten); } finally {
sinkChannel.close();
}
} finally {
sourceChannel.close();
} }
sourceChannel.close();
sinkChannel.close();
source.delete(); source.delete();
sink.delete(); sink.delete();
} }