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:
Alan Bateman 2010-09-30 14:49:14 +01:00
commit 848ef2c6e7
9 changed files with 268 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/share/classes/java/sql/Statement.java
View File

@ -1051,9 +1051,9 @@ public interface Statement extends Wrapper, AutoCloseable {
/**
* Returns a value indicating whether this {@code Statement} will be
* closed when all dependent objects such as resultsets are closed.
* closed when all its dependent result sets are closed.
* @return {@code true} if the {@code Statement} will be closed when all
* of its dependent objects are closed; {@code false} otherwise
* of its dependent result sets are closed; {@code false} otherwise
* @throws SQLException if this method is called on a closed
* {@code Statement}
* @since 1.7

4
jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java
View File

@ -88,8 +88,8 @@ public class RowSetProvider {
* </li>
* </ul>
* <li>
* The ServiceLocator API. The ServiceLocator API will look
* for a classname in the file
* The {@link ServiceLoader} API. The {@code ServiceLoader} API will look
* for a class name in the file
* {@code META-INF/services/javax.sql.rowset.RowSetFactory}
* in jars available to the runtime. For example, to have the the RowSetFactory
* implementation {@code com.sun.rowset.RowSetFactoryImpl } loaded, the

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

@ -2825,6 +2825,38 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
}
}
/* skip() calls read() in order to ensure that entire response gets
* cached. same implementation as InputStream.skip */
private byte[] skipBuffer;
private static final int SKIP_BUFFER_SIZE = 8096;
@Override
public long skip (long n) throws IOException {
long remaining = n;
int nr;
if (skipBuffer == null)
skipBuffer = new byte[SKIP_BUFFER_SIZE];
byte[] localSkipBuffer = skipBuffer;
if (n <= 0) {
return 0;
}
while (remaining > 0) {
nr = read(localSkipBuffer, 0,
(int) Math.min(SKIP_BUFFER_SIZE, remaining));
if (nr < 0) {
break;
}
remaining -= nr;
}
return n - remaining;
}
@Override
public void close () throws IOException {
try {

2
jdk/src/share/classes/sun/security/tools/KeyTool.java
View File

@ -281,7 +281,7 @@ public final class KeyTool {
RFC("rfc", null, "output in RFC style"),
SIGALG("sigalg", "<sigalg>", "signature algorithm name"),
SRCALIAS("srcalias", "<srcalias>", "source alias"),
SRCKEYPASS("srckeypass", "<arg>", "source keystore password"),
SRCKEYPASS("srckeypass", "<arg>", "source key password"),
SRCKEYSTORE("srckeystore", "<srckeystore>", "source keystore name"),
SRCPROTECTED("srcprotected", null, "source keystore password protected"),
SRCPROVIDERNAME("srcprovidername", "<srcprovidername>", "source keystore provider name"),

17
jdk/src/share/classes/sun/security/util/Resources.java
View File

@ -116,11 +116,9 @@ public class Resources extends java.util.ListResourceBundle {
{"X.509 extension",
"X.509 extension"}, //-ext
{"output file name",
"output file name"}, //-file
"output file name"}, //-file and -outfile
{"input file name",
"input file name"}, //-file
{"input file name",
"input file name"}, //-infile
"input file name"}, //-file and -infile
{"key algorithm name",
"key algorithm name"}, //-keyalg
{"key password",
@ -133,8 +131,6 @@ public class Resources extends java.util.ListResourceBundle {
"new password"}, //-new
{"do not prompt",
"do not prompt"}, //-noprompt
{"output file name",
"output file name"}, //-outfile
{"password through protected mechanism",
"password through protected mechanism"}, //-protected
{"provider argument",
@ -151,8 +147,8 @@ public class Resources extends java.util.ListResourceBundle {
"signature algorithm name"}, //-sigalg
{"source alias",
"source alias"}, //-srcalias
{"source keystore password",
"source keystore password"}, //-srckeypass
{"source key password",
"source key password"}, //-srckeypass
{"source keystore name",
"source keystore name"}, //-srckeystore
{"source keystore password protected",
@ -276,8 +272,6 @@ public class Resources extends java.util.ListResourceBundle {
"Alias <{0}> has no certificate"},
{"Key pair not generated, alias <alias> already exists",
"Key pair not generated, alias <{0}> already exists"},
{"Cannot derive signature algorithm",
"Cannot derive signature algorithm"},
{"Generating keysize bit keyAlgName key pair and self-signed certificate (sigAlgName) with a validity of validality days\n\tfor: x500Name",
"Generating {0} bit {1} key pair and self-signed certificate ({2}) with a validity of {3} days\n\tfor: {4}"},
{"Enter key password for <alias>", "Enter key password for <{0}>"},
@ -321,8 +315,6 @@ public class Resources extends java.util.ListResourceBundle {
{"Failed to parse input", "Failed to parse input"},
{"Empty input", "Empty input"},
{"Not X.509 certificate", "Not X.509 certificate"},
{"Cannot derive signature algorithm",
"Cannot derive signature algorithm"},
{"alias has no public key", "{0} has no public key"},
{"alias has no X.509 certificate", "{0} has no X.509 certificate"},
{"New certificate (self-signed):", "New certificate (self-signed):"},
@ -552,7 +544,6 @@ public class Resources extends java.util.ListResourceBundle {
{"package name", "package name"},
{"policy type", "policy type"},
{"property name", "property name"},
{"provider name", "provider name"},
{"Principal List", "Principal List"},
{"Permission List", "Permission List"},
{"Code Base", "Code Base"},

4
jdk/src/windows/native/sun/net/spi/DefaultProxySelector.c
View File

@ -250,6 +250,10 @@ Java_sun_net_spi_DefaultProxySelector_getSystemProxy(JNIEnv *env,
return proxy;
}
}
} else {
/* ProxyEnable == 0 or Query failed */
/* close the handle to the registry key */
RegCloseKey(hKey);
}
}

62
jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh
View File

@ -1,62 +0,0 @@
#
# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# @test
# @bug 6502503
# @run shell/timeout=140 ChunkedCharEncoding.sh
# @summary Http URL connection don't work when default encoding is Cp037: HTTP Transfer-Encoding:chunked
OS=`uname -s`
case "$OS" in
SunOS | Linux )
PS=":"
FS="/"
;;
CYGWIN* )
PS=";"
FS="/"
;;
Windows* )
PS=";"
FS="\\"
;;
* )
echo "Unrecognized system!"
exit 1;
;;
esac
# compile
${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}TestAvailable.java
# run with CP037 encoding specified.
${TESTJAVA}${FS}bin${FS}java -Dfile.encoding=Cp037 TestAvailable 2>&1
result=$?
if [ "$result" -ne "0" ]; then
exit 1
fi
# no failures, exit.
exit 0

133
jdk/test/sun/net/www/protocol/http/6550798/TestCache.java Normal file
View File

@ -0,0 +1,133 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
import java.net.*;
import java.io.*;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.PrintStream;
import java.io.InputStream;
import java.io.File;
import java.net.CacheRequest;
import java.net.CacheResponse;
import java.net.ResponseCache;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
import java.util.Iterator;
import java.util.StringTokenizer;
import java.util.jar.JarInputStream;
import java.util.jar.JarFile;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
import java.security.Principal;
import java.security.cert.Certificate;
import javax.net.ssl.SSLPeerUnverifiedException;
public class TestCache extends java.net.ResponseCache {
private boolean inCacheHandler = false;
private boolean _downloading = false;
public static volatile boolean fail = false;
public static void reset() {
// Set system wide cache handler
System.out.println("install deploy cache handler");
ResponseCache.setDefault(new TestCache());
}
public synchronized CacheResponse get(final URI uri, String rqstMethod,
Map requestHeaders) throws IOException {
System.out.println("get: " + uri);
Thread.currentThread().dumpStack();
return null;
}
public synchronized CacheRequest put(URI uri, URLConnection conn)
throws IOException {
System.out.println("put: " + uri);
Thread.currentThread().dumpStack();
URL url = uri.toURL();
return new DeployCacheRequest(url, conn);
}
}
class DeployByteArrayOutputStream extends java.io.ByteArrayOutputStream {
private URL _url;
private URLConnection _conn;
DeployByteArrayOutputStream(URL url, URLConnection conn) {
_url = url;
_conn = conn;
}
public void close() throws IOException {
System.out.println("contentLength: " + _conn.getContentLength());
System.out.println("byte array size: " + size());
if ( _conn.getContentLength() == size()) {
System.out.println("correct content length");
} else {
System.out.println("wrong content length");
System.out.println("TEST FAILED");
TestCache.fail = true;
}
super.close();
}
}
class DeployCacheRequest extends java.net.CacheRequest {
private URL _url;
private URLConnection _conn;
private boolean _downloading = false;
DeployCacheRequest(URL url, URLConnection conn) {
System.out.println("DeployCacheRequest ctor for: " + url);
_url = url;
_conn = conn;
}
public void abort() {
System.out.println("abort called");
}
public OutputStream getBody() throws IOException {
System.out.println("getBody called");
return new DeployByteArrayOutputStream(_url, _conn);
}
}

90
jdk/test/sun/net/www/protocol/http/6550798/test.java Normal file
View File

@ -0,0 +1,90 @@
/*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/**
* @test
* @bug 6550798
* @summary Using InputStream.skip with ResponseCache will cause partial data to be cached
* @run main/othervm test
*/
import java.net.*;
import com.sun.net.httpserver.*;
import java.io.*;
public class test {
final static int LEN = 16 * 1024;
public static void main(String[] args) throws Exception {
TestCache.reset();
HttpServer s = HttpServer.create (new InetSocketAddress(0), 10);
s.createContext ("/", new HttpHandler () {
public void handle (HttpExchange e) {
try {
byte[] buf = new byte [LEN];
OutputStream o = e.getResponseBody();
e.sendResponseHeaders(200, LEN);
o.write (buf);
e.close();
} catch (IOException ex) {
ex.printStackTrace();
TestCache.fail = true;
}
}
});
s.start();
System.out.println("http request with cache hander");
URL u = new URL("http://127.0.0.1:"+s.getAddress().getPort()+"/f");
URLConnection conn = u.openConnection();
InputStream is = null;
try {
// this calls into TestCache.get
byte[] buf = new byte[8192];
is = new BufferedInputStream(conn.getInputStream());
is.skip(1000);
while (is.read(buf) != -1) {
}
} finally {
if (is != null) {
// this calls into TestCache.put
// TestCache.put will check if the resource
// should be cached
is.close();
}
s.stop(0);
}
if (TestCache.fail) {
System.out.println ("TEST FAILED");
throw new RuntimeException ();
} else {
System.out.println ("TEST OK");
}
}
}