infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-27 02:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Abhijit Saha 2010-06-28 13:07:23 -07:00
commit 833dfdcbf2
7 changed files with 42 additions and 33 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
# sun/nio/cs/ext/ will go into charsets.jar
######################################################
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) "com/sun/tools/" >> $@
$(ECHO) "sun/jvmstat/" >> $@
$(ECHO) "sun/nio/cs/ext/" >> $@
$(ECHO) "sun/rmi/rmic/" >> $@
$(ECHO) "sun/tools/asm/" >> $@
$(ECHO) "sun/tools/java/" >> $@

2
jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
View File

@ -2331,7 +2331,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
* closed the connection to the web server.
*/
private void disconnectWeb() throws IOException {
if (usingProxy()) {
if (usingProxy() && http.isKeepingAlive()) {
responseCode = -1;
// clean up, particularly, skip the content part
// of a 401 error response

3
jdk/test/ProblemList.txt
View File

@ -379,9 +379,6 @@ sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java
# Interrupted or IO exception, maybe writing to non-unique named file?
com/sun/net/httpserver/bugs/B6373555.java generic-all
# Fails on OpenSolaris, BindException unexpected
java/net/BindException/Test.java generic-all
# Fails on OpenSolaris, times out
java/net/MulticastSocket/SetOutgoingIf.java generic-all

5
jdk/test/java/net/Authenticator/B4769350.java
View File

@ -54,6 +54,7 @@ public class B4769350 {
boolean allowerror;
Client (String authority, String path, boolean allowerror) {
super("Thread-" + path);
this.authority = authority;
this.path = path;
this.allowerror = allowerror;
@ -72,7 +73,8 @@ public class B4769350 {
error = true;
} catch (IOException e) {
if (!allowerror) {
System.out.println (e);
System.out.println (Thread.currentThread().getName() + " " + e);
e.printStackTrace();
error = true;
}
}
@ -94,6 +96,7 @@ public class B4769350 {
}
void okReply (HttpTransaction req) throws IOException {
req.addResponseHeader ("Connection", "close");
req.setResponseEntityBody ("Hello .");
req.sendResponse (200, "Ok");
req.orderlyClose();

2
jdk/test/java/net/BindException/Test.java
View File

@ -180,7 +180,7 @@ public class Test {
while (addrs.hasMoreElements()) {
InetAddress ia = (InetAddress)addrs.nextElement();
if (ia.isLoopbackAddress()) {
if (ia.isLoopbackAddress() || ia.isAnyLocalAddress()) {
continue;
}

3
jdk/test/java/net/ipv6tests/Tests.java
View File

@ -248,7 +248,8 @@ public class Tests {
}
while (addrs.hasMoreElements()) {
InetAddress addr = (InetAddress) addrs.nextElement();
if (filter.isInstance (addr) && !addr.isLoopbackAddress()) {
if (filter.isInstance (addr) && !addr.isLoopbackAddress()
&& !addr.isAnyLocalAddress()) {
if (Arrays.equals (addr.getAddress(), fe80_loopback)) {
continue;
}

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

@ -25,7 +25,6 @@
* @bug 4434723 4482726 4559072 4638365 4795550 5081340 5103988 6253145
* @summary Test FileChannel.transferFrom and transferTo
* @library ..
* @run main/timeout=240 Transfer
*/
import java.io.*;
@ -33,6 +32,8 @@ import java.net.*;
import java.nio.*;
import java.nio.channels.*;
import java.nio.channels.spi.SelectorProvider;
import java.nio.file.StandardOpenOption;
import java.nio.file.FileAlreadyExistsException;
import java.util.Random;
@ -262,23 +263,30 @@ public class Transfer {
// Test transferFrom with large file
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
File source = File.createTempFile("blech", null);
source.deleteOnExit();
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();
long testSize = ((long)Integer.MAX_VALUE) * 2;
RandomAccessFile raf = new RandomAccessFile(sink, "rw");
FileChannel fc = raf.getChannel();
try {
fc.write(ByteBuffer.wrap("Use the source!".getBytes()),
testSize - 40);
@ -288,24 +296,26 @@ public class Transfer {
return;
} finally {
fc.close();
raf.close();
}
// Get new channels for the source and sink and attempt transfer
FileInputStream fis = new FileInputStream(source);
FileChannel sourceChannel = fis.getChannel();
raf = new RandomAccessFile(sink, "rw");
FileChannel sinkChannel = raf.getChannel();
long bytesWritten = sinkChannel.transferFrom(sourceChannel,
testSize - 40, 10);
if (bytesWritten != 10) {
throw new RuntimeException("Transfer test 5 failed " +
bytesWritten);
FileChannel sourceChannel = new FileInputStream(source).getChannel();
try {
FileChannel sinkChannel = new RandomAccessFile(sink, "rw").getChannel();
try {
long bytesWritten = sinkChannel.transferFrom(sourceChannel,
testSize - 40, 10);
if (bytesWritten != 10) {
throw new RuntimeException("Transfer test 5 failed " +
bytesWritten);
}
} finally {
sinkChannel.close();
}
} finally {
sourceChannel.close();
}
sourceChannel.close();
sinkChannel.close();
source.delete();
sink.delete();
}