the standard output or standard error of the
* subprocess was
* {@linkplain #redirectOutput redirected to a file}
* and the security manager's
- * {@link SecurityManager#checkWrite checkWrite} method
+ * {@link SecurityManager#checkWrite(String) checkWrite} method
* denies write access to the file
*
*
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/java/util/Date.java
--- a/jdk/src/java.base/share/classes/java/util/Date.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/util/Date.java Mon Apr 06 10:35:43 2015 -0700
@@ -1317,6 +1317,7 @@
private void writeObject(ObjectOutputStream s)
throws IOException
{
+ s.defaultWriteObject();
s.writeLong(getTimeImpl());
}
@@ -1326,6 +1327,7 @@
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException
{
+ s.defaultReadObject();
fastTime = s.readLong();
}
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/java/util/Optional.java
--- a/jdk/src/java.base/share/classes/java/util/Optional.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/util/Optional.java Mon Apr 06 10:35:43 2015 -0700
@@ -346,7 +346,7 @@
*
*
* @param obj an object to be tested for equality
- * @return {code true} if the other object is "equal to" this object
+ * @return {@code true} if the other object is "equal to" this object
* otherwise {@code false}
*/
@Override
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/java/util/OptionalDouble.java
--- a/jdk/src/java.base/share/classes/java/util/OptionalDouble.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/util/OptionalDouble.java Mon Apr 06 10:35:43 2015 -0700
@@ -244,7 +244,7 @@
*
*
* @param obj an object to be tested for equality
- * @return {code true} if the other object is "equal to" this object
+ * @return {@code true} if the other object is "equal to" this object
* otherwise {@code false}
*/
@Override
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/java/util/OptionalInt.java
--- a/jdk/src/java.base/share/classes/java/util/OptionalInt.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/util/OptionalInt.java Mon Apr 06 10:35:43 2015 -0700
@@ -244,7 +244,7 @@
*
*
* @param obj an object to be tested for equality
- * @return {code true} if the other object is "equal to" this object
+ * @return {@code true} if the other object is "equal to" this object
* otherwise {@code false}
*/
@Override
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/java/util/OptionalLong.java
--- a/jdk/src/java.base/share/classes/java/util/OptionalLong.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/util/OptionalLong.java Mon Apr 06 10:35:43 2015 -0700
@@ -244,7 +244,7 @@
*
*
* @param obj an object to be tested for equality
- * @return {code true} if the other object is "equal to" this object
+ * @return {@code true} if the other object is "equal to" this object
* otherwise {@code false}
*/
@Override
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/java/util/Properties.java
--- a/jdk/src/java.base/share/classes/java/util/Properties.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/util/Properties.java Mon Apr 06 10:35:43 2015 -0700
@@ -309,7 +309,7 @@
* input stream.
* @throws IllegalArgumentException if a malformed Unicode escape
* appears in the input.
- * @throws NullPointerException if {@code reader} is null.
+ * @throws NullPointerException if {@code reader} is null.
* @since 1.6
*/
public synchronized void load(Reader reader) throws IOException {
@@ -335,7 +335,7 @@
* input stream.
* @throws IllegalArgumentException if the input stream contains a
* malformed Unicode escape sequence.
- * @throws NullPointerException if {@code inStream} is null.
+ * @throws NullPointerException if {@code inStream} is null.
* @since 1.2
*/
public synchronized void load(InputStream inStream) throws IOException {
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/java/util/stream/AbstractPipeline.java
--- a/jdk/src/java.base/share/classes/java/util/stream/AbstractPipeline.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/util/stream/AbstractPipeline.java Mon Apr 06 10:35:43 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -380,60 +380,6 @@
}
/**
- * Prepare the pipeline for a parallel execution. As the pipeline is built,
- * the flags and depth indicators are set up for a sequential execution.
- * If the execution is parallel, and there are any stateful operations, then
- * some of these need to be adjusted, as well as adjusting for flags from
- * the terminal operation (such as back-propagating UNORDERED).
- * Need not be called for a sequential execution.
- *
- * @param terminalFlags Operation flags for the terminal operation
- */
- private void parallelPrepare(int terminalFlags) {
- @SuppressWarnings("rawtypes")
- AbstractPipeline backPropagationHead = sourceStage;
- if (sourceStage.sourceAnyStateful) {
- int depth = 1;
- for ( @SuppressWarnings("rawtypes") AbstractPipeline u = sourceStage, p = sourceStage.nextStage;
- p != null;
- u = p, p = p.nextStage) {
- int thisOpFlags = p.sourceOrOpFlags;
- if (p.opIsStateful()) {
- // If the stateful operation is a short-circuit operation
- // then move the back propagation head forwards
- // NOTE: there are no size-injecting ops
- if (StreamOpFlag.SHORT_CIRCUIT.isKnown(thisOpFlags)) {
- backPropagationHead = p;
- // Clear the short circuit flag for next pipeline stage
- // This stage encapsulates short-circuiting, the next
- // stage may not have any short-circuit operations, and
- // if so spliterator.forEachRemaining should be used
- // for traversal
- thisOpFlags = thisOpFlags & ~StreamOpFlag.IS_SHORT_CIRCUIT;
- }
-
- depth = 0;
- // The following injects size, it is equivalent to:
- // StreamOpFlag.combineOpFlags(StreamOpFlag.IS_SIZED, p.combinedFlags);
- thisOpFlags = (thisOpFlags & ~StreamOpFlag.NOT_SIZED) | StreamOpFlag.IS_SIZED;
- }
- p.depth = depth++;
- p.combinedFlags = StreamOpFlag.combineOpFlags(thisOpFlags, u.combinedFlags);
- }
- }
-
- // Apply the upstream terminal flags
- if (terminalFlags != 0) {
- int upstreamTerminalFlags = terminalFlags & StreamOpFlag.UPSTREAM_TERMINAL_OP_MASK;
- for ( @SuppressWarnings("rawtypes") AbstractPipeline p = backPropagationHead; p.nextStage != null; p = p.nextStage) {
- p.combinedFlags = StreamOpFlag.combineOpFlags(upstreamTerminalFlags, p.combinedFlags);
- }
-
- combinedFlags = StreamOpFlag.combineOpFlags(terminalFlags, combinedFlags);
- }
- }
-
- /**
* Get the source spliterator for this pipeline stage. For a sequential or
* stateless parallel pipeline, this is the source spliterator. For a
* stateful parallel pipeline, this is a spliterator describing the results
@@ -456,24 +402,70 @@
throw new IllegalStateException(MSG_CONSUMED);
}
- if (isParallel()) {
- // @@@ Merge parallelPrepare with the loop below and use the
- // spliterator characteristics to determine if SIZED
- // should be injected
- parallelPrepare(terminalFlags);
+ boolean hasTerminalFlags = terminalFlags != 0;
+ if (isParallel() && sourceStage.sourceAnyStateful) {
+ // Adjust pipeline stages if there are stateful ops,
+ // and find the last short circuiting op, if any, that
+ // defines the head stage for back-propagation of terminal flags
+ @SuppressWarnings("rawtypes")
+ AbstractPipeline backPropagationHead = sourceStage;
+ int depth = 1;
+ for (@SuppressWarnings("rawtypes") AbstractPipeline p = sourceStage.nextStage;
+ p != null;
+ p = p.nextStage) {
+ if (p.opIsStateful()) {
+ if (StreamOpFlag.SHORT_CIRCUIT.isKnown(p.sourceOrOpFlags)) {
+ // If the stateful operation is a short-circuit operation
+ // then move the back propagation head forwards
+ // NOTE: there are no size-injecting ops
+ backPropagationHead = p;
+ }
+
+ depth = 0;
+ }
+ p.depth = depth++;
+ }
// Adapt the source spliterator, evaluating each stateful op
// in the pipeline up to and including this pipeline stage
- for ( @SuppressWarnings("rawtypes") AbstractPipeline u = sourceStage, p = sourceStage.nextStage, e = this;
+ // Flags for each pipeline stage are adjusted accordingly
+ boolean backPropagate = false;
+ int upstreamTerminalFlags = terminalFlags & StreamOpFlag.UPSTREAM_TERMINAL_OP_MASK;
+ for (@SuppressWarnings("rawtypes") AbstractPipeline u = sourceStage, p = sourceStage.nextStage, e = this;
u != e;
u = p, p = p.nextStage) {
+ if (hasTerminalFlags &&
+ (backPropagate || (backPropagate = (u == backPropagationHead)))) {
+ // Back-propagate flags from the terminal operation
+ u.combinedFlags = StreamOpFlag.combineOpFlags(upstreamTerminalFlags, u.combinedFlags);
+ }
+
+ int thisOpFlags = p.sourceOrOpFlags;
if (p.opIsStateful()) {
+ if (StreamOpFlag.SHORT_CIRCUIT.isKnown(thisOpFlags)) {
+ // Clear the short circuit flag for next pipeline stage
+ // This stage encapsulates short-circuiting, the next
+ // stage may not have any short-circuit operations, and
+ // if so spliterator.forEachRemaining should be used
+ // for traversal
+ thisOpFlags = thisOpFlags & ~StreamOpFlag.IS_SHORT_CIRCUIT;
+ }
+
spliterator = p.opEvaluateParallelLazy(u, spliterator);
+
+ // Inject or clear SIZED on the source pipeline stage
+ // based on the stage's spliterator
+ thisOpFlags = spliterator.hasCharacteristics(Spliterator.SIZED)
+ ? (thisOpFlags & ~StreamOpFlag.NOT_SIZED) | StreamOpFlag.IS_SIZED
+ : (thisOpFlags & ~StreamOpFlag.IS_SIZED) | StreamOpFlag.NOT_SIZED;
}
+ p.combinedFlags = StreamOpFlag.combineOpFlags(thisOpFlags, u.combinedFlags);
}
}
- else if (terminalFlags != 0) {
+
+ if (hasTerminalFlags) {
+ // Apply flags from the terminal operation to last pipeline stage
combinedFlags = StreamOpFlag.combineOpFlags(terminalFlags, combinedFlags);
}
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java
--- a/jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/java/util/stream/ReduceOps.java Mon Apr 06 10:35:43 2015 -0700
@@ -264,6 +264,11 @@
return spliterator.getExactSizeIfKnown();
return super.evaluateParallel(helper, spliterator);
}
+
+ @Override
+ public int getOpFlags() {
+ return StreamOpFlag.NOT_ORDERED;
+ }
};
}
@@ -433,6 +438,11 @@
return spliterator.getExactSizeIfKnown();
return super.evaluateParallel(helper, spliterator);
}
+
+ @Override
+ public int getOpFlags() {
+ return StreamOpFlag.NOT_ORDERED;
+ }
};
}
@@ -602,6 +612,11 @@
return spliterator.getExactSizeIfKnown();
return super.evaluateParallel(helper, spliterator);
}
+
+ @Override
+ public int getOpFlags() {
+ return StreamOpFlag.NOT_ORDERED;
+ }
};
}
@@ -771,6 +786,11 @@
return spliterator.getExactSizeIfKnown();
return super.evaluateParallel(helper, spliterator);
}
+
+ @Override
+ public int getOpFlags() {
+ return StreamOpFlag.NOT_ORDERED;
+ }
};
}
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java Mon Apr 06 10:35:43 2015 -0700
@@ -262,27 +262,6 @@
}
/**
- * Returns the server's X.509 certificate chain, or null if
- * the server did not authenticate.
- *
- * @deprecated This method returns the deprecated
- * {@code javax.security.cert.X509Certificate} type.
- * Use {@code getServerCertificates()} instead.
- */
- @Deprecated
- public javax.security.cert.X509Certificate[] getServerCertificateChain()
- throws SSLPeerUnverifiedException {
- if (cachedResponse != null) {
- throw new UnsupportedOperationException("this method is not supported when using cache");
- }
- if (http == null) {
- throw new IllegalStateException("connection not yet open");
- } else {
- return ((HttpsClient)http).getServerCertificateChain();
- }
- }
-
- /**
* Returns the server's principal, or throws SSLPeerUnverifiedException
* if the server did not authenticate.
*/
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsClient.java Mon Apr 06 10:35:43 2015 -0700
@@ -697,21 +697,6 @@
}
/**
- * Returns the X.509 certificate chain with which the server
- * authenticated itself, or null if the server did not authenticate.
- *
- * @deprecated This method returns the deprecated
- * {@code javax.security.cert.X509Certificate} type.
- * Use {@code getServerCertificates()} instead.
- */
- @Deprecated
- javax.security.cert.X509Certificate [] getServerCertificateChain()
- throws SSLPeerUnverifiedException
- {
- return session.getPeerCertificateChain();
- }
-
- /**
* Returns the principal with which the server authenticated
* itself, or throw a SSLPeerUnverifiedException if the
* server did not authenticate.
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java Mon Apr 06 10:35:43 2015 -0700
@@ -198,30 +198,6 @@
}
/**
- * Returns the server's X.509 certificate chain, or null if
- * the server did not authenticate.
- *
- * NOTE: This method is not necessary for the version of this class
- * implementing javax.net.ssl.HttpsURLConnection, but provided for
- * compatibility with the com.sun.net.ssl.HttpsURLConnection version.
- *
- * @deprecated This method returns the deprecated
- * {@code javax.security.cert.X509Certificate} type.
- * Use {@code getServerCertificates()} instead.
- */
- @Deprecated
- public javax.security.cert.X509Certificate[] getServerCertificateChain() {
- try {
- return delegate.getServerCertificateChain();
- } catch (SSLPeerUnverifiedException e) {
- // this method does not throw an exception as declared in
- // com.sun.net.ssl.HttpsURLConnection.
- // Return null for compatibility.
- return null;
- }
- }
-
- /**
* Returns the principal with which the server authenticated itself,
* or throw a SSLPeerUnverifiedException if the server did not authenticate.
*/
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java
--- a/jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/pkcs10/PKCS10.java Mon Apr 06 10:35:43 2015 -0700
@@ -290,8 +290,9 @@
throw new SignatureException("Cert request was not signed");
+ byte[] CRLF = new byte[] {'\r', '\n'};
out.println("-----BEGIN NEW CERTIFICATE REQUEST-----");
- out.println(Base64.getMimeEncoder().encodeToString(encoded));
+ out.println(Base64.getMimeEncoder(64, CRLF).encodeToString(encoded));
out.println("-----END NEW CERTIFICATE REQUEST-----");
}
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java
--- a/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/provider/X509Factory.java Mon Apr 06 10:35:43 2015 -0700
@@ -28,6 +28,8 @@
import java.io.*;
import java.util.*;
import java.security.cert.*;
+
+import sun.security.util.Pem;
import sun.security.x509.X509CertImpl;
import sun.security.x509.X509CRLImpl;
import sun.security.pkcs.PKCS7;
@@ -633,7 +635,7 @@
checkHeaderFooter(header.toString(), footer.toString());
- return Base64.getMimeDecoder().decode(new String(data, 0, pos));
+ return Pem.decode(new String(data, 0, pos));
}
}
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java
--- a/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/tools/keytool/Main.java Mon Apr 06 10:35:43 2015 -0700
@@ -80,6 +80,7 @@
import sun.security.tools.KeyStoreUtil;
import sun.security.tools.PathList;
import sun.security.util.DerValue;
+import sun.security.util.Pem;
import sun.security.x509.*;
import static java.security.KeyStore.*;
@@ -100,6 +101,8 @@
*/
public final class Main {
+ private static final byte[] CRLF = new byte[] {'\r', '\n'};
+
private boolean debug = false;
private Command command = null;
private String sigAlgName = null;
@@ -1266,7 +1269,7 @@
sb.append(s);
}
}
- byte[] rawReq = Base64.getMimeDecoder().decode(new String(sb));
+ byte[] rawReq = Pem.decode(new String(sb));
PKCS10 req = new PKCS10(rawReq);
info.set(X509CertInfo.KEY, new CertificateX509Key(req.getSubjectPublicKeyInfo()));
@@ -1343,7 +1346,7 @@
crl.sign(privateKey, sigAlgName);
if (rfc) {
out.println("-----BEGIN X509 CRL-----");
- out.println(Base64.getMimeEncoder().encodeToString(crl.getEncodedInternal()));
+ out.println(Base64.getMimeEncoder(64, CRLF).encodeToString(crl.getEncodedInternal()));
out.println("-----END X509 CRL-----");
} else {
out.write(crl.getEncodedInternal());
@@ -2304,7 +2307,7 @@
if (rfc) {
X509CRL xcrl = (X509CRL)crl;
out.println("-----BEGIN X509 CRL-----");
- out.println(Base64.getMimeEncoder().encodeToString(xcrl.getEncoded()));
+ out.println(Base64.getMimeEncoder(64, CRLF).encodeToString(xcrl.getEncoded()));
out.println("-----END X509 CRL-----");
} else {
out.println(crl.toString());
@@ -2331,7 +2334,7 @@
sb.append(s);
}
}
- PKCS10 req = new PKCS10(Base64.getMimeDecoder().decode(new String(sb)));
+ PKCS10 req = new PKCS10(Pem.decode(new String(sb)));
PublicKey pkey = req.getSubjectPublicKeyInfo();
out.printf(rb.getString("PKCS.10.Certificate.Request.Version.1.0.Subject.s.Public.Key.s.format.s.key."),
@@ -3115,7 +3118,7 @@
{
if (rfc) {
out.println(X509Factory.BEGIN_CERT);
- out.println(Base64.getMimeEncoder().encodeToString(cert.getEncoded()));
+ out.println(Base64.getMimeEncoder(64, CRLF).encodeToString(cert.getEncoded()));
out.println(X509Factory.END_CERT);
} else {
out.write(cert.getEncoded()); // binary
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/sun/security/util/Pem.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/share/classes/sun/security/util/Pem.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2015, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.
+ */
+
+package sun.security.util;
+
+import java.io.IOException;
+import java.util.Base64;
+
+/**
+ * The Length interface defines the length of an object
+ */
+public class Pem {
+
+ /**
+ * Decodes a PEM-encoded block.
+ *
+ * @param input the input string, according to RFC 1421, can only contain
+ * characters in the base-64 alphabet and whitespaces.
+ * @return the decoded bytes
+ * @throws java.io.IOException if input is invalid
+ */
+ public static byte[] decode(String input) throws IOException {
+ byte[] src = input.replaceAll("\\s+", "").getBytes();
+ try {
+ return Base64.getDecoder().decode(src);
+ } catch (IllegalArgumentException e) {
+ throw new IOException(e);
+ }
+ }
+}
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java
--- a/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/x509/X509CertImpl.java Mon Apr 06 10:35:43 2015 -0700
@@ -271,7 +271,7 @@
der = new DerValue(decstream.toByteArray());
break;
} else {
- decstream.write(Base64.getMimeDecoder().decode(line));
+ decstream.write(Pem.decode(line));
}
}
} catch (IOException ioe2) {
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java
--- a/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java Mon Apr 06 10:35:43 2015 -0700
@@ -496,12 +496,11 @@
public synchronized boolean waitFor(long timeout, TimeUnit unit)
throws InterruptedException
{
+ long remainingNanos = unit.toNanos(timeout); // throw NPE before other conditions
if (hasExited) return true;
if (timeout <= 0) return false;
- long remainingNanos = unit.toNanos(timeout);
long deadline = System.nanoTime() + remainingNanos;
-
do {
// Round up to next millisecond
wait(TimeUnit.NANOSECONDS.toMillis(remainingNanos + 999_999L));
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java
--- a/jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java Mon Apr 06 10:35:43 2015 -0700
@@ -458,12 +458,11 @@
public boolean waitFor(long timeout, TimeUnit unit)
throws InterruptedException
{
+ long remainingNanos = unit.toNanos(timeout); // throw NPE before other conditions
if (getExitCodeProcess(handle) != STILL_ACTIVE) return true;
if (timeout <= 0) return false;
- long remainingNanos = unit.toNanos(timeout);
long deadline = System.nanoTime() + remainingNanos ;
-
do {
// Round up to next millisecond
long msTimeout = TimeUnit.NANOSECONDS.toMillis(remainingNanos + 999_999L);
diff -r d47c58140b41 -r 427f83353f73 jdk/src/java.management/share/classes/com/sun/management/DiagnosticCommandMBean.java
--- a/jdk/src/java.management/share/classes/com/sun/management/DiagnosticCommandMBean.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/java.management/share/classes/com/sun/management/DiagnosticCommandMBean.java Mon Apr 06 10:35:43 2015 -0700
@@ -31,7 +31,7 @@
/**
* Management interface for the diagnostic commands for the HotSpot Virtual Machine.
*
- * The {code DiagnosticCommandMBean} is registered to the
+ *
The {@code DiagnosticCommandMBean} is registered to the
* {@linkplain java.lang.management.ManagementFactory#getPlatformMBeanServer
* platform MBeanServer} as are other platform MBeans.
*
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c
--- a/jdk/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c Mon Apr 06 10:35:43 2015 -0700
@@ -26,6 +26,7 @@
#include "jni.h"
#include "jni_util.h"
+#include "jvm.h"
#include
#include
@@ -184,15 +185,26 @@
res = errno;
}
- /* release p here before we throw an I/O exception */
- if (isCopy) {
- JNU_ReleaseStringPlatformChars(env, path, p);
- }
-
if (res == 0) {
- if ( (sb.st_uid != uid) || (sb.st_gid != gid) ||
- ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) ) {
- JNU_ThrowIOException(env, "well-known file is not secure");
+ char msg[100];
+ jboolean isError = JNI_FALSE;
+ if (sb.st_uid != uid) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
+ isError = JNI_TRUE;
+ } else if (sb.st_gid != gid) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
+ isError = JNI_TRUE;
+ } else if ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file should only be readable and writable by the owner but has 0%03o access", sb.st_mode & 0777);
+ isError = JNI_TRUE;
+ }
+ if (isError) {
+ char buf[256];
+ jio_snprintf(buf, sizeof(buf)-1, "well-known file %s is not secure: %s", p, msg);
+ JNU_ThrowIOException(env, buf);
}
} else {
char* msg = strdup(strerror(res));
@@ -201,6 +213,10 @@
free(msg);
}
}
+
+ if (isCopy) {
+ JNU_ReleaseStringPlatformChars(env, path, p);
+ }
}
}
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c
--- a/jdk/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c Mon Apr 06 10:35:43 2015 -0700
@@ -25,6 +25,7 @@
#include "jni.h"
#include "jni_util.h"
+#include "jvm.h"
#include
#include
@@ -369,15 +370,26 @@
res = errno;
}
- /* release p here before we throw an I/O exception */
- if (isCopy) {
- JNU_ReleaseStringPlatformChars(env, path, p);
- }
-
if (res == 0) {
- if ( (sb.st_uid != uid) || (sb.st_gid != gid) ||
- ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) ) {
- JNU_ThrowIOException(env, "well-known file is not secure");
+ char msg[100];
+ jboolean isError = JNI_FALSE;
+ if (sb.st_uid != uid) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
+ isError = JNI_TRUE;
+ } else if (sb.st_gid != gid) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
+ isError = JNI_TRUE;
+ } else if ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file should only be readable and writable by the owner but has 0%03o access", sb.st_mode & 0777);
+ isError = JNI_TRUE;
+ }
+ if (isError) {
+ char buf[256];
+ jio_snprintf(buf, sizeof(buf)-1, "well-known file %s is not secure: %s", p, msg);
+ JNU_ThrowIOException(env, buf);
}
} else {
char* msg = strdup(strerror(res));
@@ -386,6 +398,10 @@
free(msg);
}
}
+
+ if (isCopy) {
+ JNU_ReleaseStringPlatformChars(env, path, p);
+ }
}
}
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c
--- a/jdk/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.attach/macosx/native/libattach/VirtualMachineImpl.c Mon Apr 06 10:35:43 2015 -0700
@@ -25,6 +25,7 @@
#include "jni.h"
#include "jni_util.h"
+#include "jvm.h"
#include
#include
@@ -151,15 +152,26 @@
res = errno;
}
- /* release p here before we throw an I/O exception */
- if (isCopy) {
- JNU_ReleaseStringPlatformChars(env, path, p);
- }
-
if (res == 0) {
- if ( (sb.st_uid != uid) || (sb.st_gid != gid) ||
- ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) ) {
- JNU_ThrowIOException(env, "well-known file is not secure");
+ char msg[100];
+ jboolean isError = JNI_FALSE;
+ if (sb.st_uid != uid) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
+ isError = JNI_TRUE;
+ } else if (sb.st_gid != gid) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
+ isError = JNI_TRUE;
+ } else if ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file should only be readable and writable by the owner but has 0%03o access", sb.st_mode & 0777);
+ isError = JNI_TRUE;
+ }
+ if (isError) {
+ char buf[256];
+ jio_snprintf(buf, sizeof(buf)-1, "well-known file %s is not secure: %s", p, msg);
+ JNU_ThrowIOException(env, buf);
}
} else {
char* msg = strdup(strerror(res));
@@ -168,6 +180,10 @@
free(msg);
}
}
+
+ if (isCopy) {
+ JNU_ReleaseStringPlatformChars(env, path, p);
+ }
}
}
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c
--- a/jdk/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.attach/solaris/native/libattach/VirtualMachineImpl.c Mon Apr 06 10:35:43 2015 -0700
@@ -35,6 +35,7 @@
#include "jni.h"
#include "jni_util.h"
+#include "jvm.h"
#include "sun_tools_attach_VirtualMachineImpl.h"
@@ -112,15 +113,26 @@
res = errno;
}
- /* release p here before we throw an I/O exception */
- if (isCopy) {
- JNU_ReleaseStringPlatformChars(env, path, p);
- }
-
if (res == 0) {
- if ( (sb.st_uid != uid) || (sb.st_gid != gid) ||
- ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) ) {
- JNU_ThrowIOException(env, "well-known file is not secure");
+ char msg[100];
+ jboolean isError = JNI_FALSE;
+ if (sb.st_uid != uid) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file should be owned by the current user (which is %d) but is owned by %d", uid, sb.st_uid);
+ isError = JNI_TRUE;
+ } else if (sb.st_gid != gid) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file's group should be the current group (which is %d) but the group is %d", gid, sb.st_gid);
+ isError = JNI_TRUE;
+ } else if ((sb.st_mode & (S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) != 0) {
+ jio_snprintf(msg, sizeof(msg)-1,
+ "file should only be readable and writable by the owner but has 0%03o access", sb.st_mode & 0777);
+ isError = JNI_TRUE;
+ }
+ if (isError) {
+ char buf[256];
+ jio_snprintf(buf, sizeof(buf)-1, "well-known file %s is not secure: %s", p, msg);
+ JNU_ThrowIOException(env, buf);
}
} else {
char* msg = strdup(strerror(res));
@@ -129,6 +141,10 @@
free(msg);
}
}
+
+ if (isCopy) {
+ JNU_ReleaseStringPlatformChars(env, path, p);
+ }
}
}
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de.java
--- a/jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.localedata/share/classes/sun/text/resources/de/FormatData_de.java Mon Apr 06 10:35:43 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, 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
@@ -142,7 +142,7 @@
new String[] {
"Jan", // abb january
"Feb", // abb february
- "Mrz", // abb march
+ "M\u00e4r", // abb march
"Apr", // abb april
"Mai", // abb may
"Jun", // abb june
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.pack200/share/native/common-unpack/bytes.h
--- a/jdk/src/jdk.pack200/share/native/common-unpack/bytes.h Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.pack200/share/native/common-unpack/bytes.h Mon Apr 06 10:35:43 2015 -0700
@@ -63,7 +63,7 @@
bytes res;
res.ptr = ptr + beg;
res.len = end - beg;
- assert(res.len == 0 || inBounds(res.ptr) && inBounds(res.limit()-1));
+ assert(res.len == 0 || (inBounds(res.ptr) && inBounds(res.limit()-1)));
return res;
}
// building C strings inside byte buffers:
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp
--- a/jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.pack200/share/native/common-unpack/unpack.cpp Mon Apr 06 10:35:43 2015 -0700
@@ -225,9 +225,9 @@
}
#ifdef PRODUCT
- char* string() { return 0; }
+ const char* string() { return NULL; }
#else
- char* string(); // see far below
+ const char* string(); // see far below
#endif
};
@@ -718,13 +718,13 @@
// Now we can size the whole archive.
// Read everything else into a mega-buffer.
rp = hdr.rp;
- int header_size_0 = (int)(rp - input.base()); // used-up header (4byte + 3int)
- int header_size_1 = (int)(rplimit - rp); // buffered unused initial fragment
- int header_size = header_size_0+header_size_1;
+ size_t header_size_0 = (rp - input.base()); // used-up header (4byte + 3int)
+ size_t header_size_1 = (rplimit - rp); // buffered unused initial fragment
+ size_t header_size = header_size_0 + header_size_1;
unsized_bytes_read = header_size_0;
CHECK;
if (foreign_buf) {
- if (archive_size > (size_t)header_size_1) {
+ if (archive_size > header_size_1) {
abort("EOF reading fixed input buffer");
return;
}
@@ -738,7 +738,7 @@
return;
}
input.set(U_NEW(byte, add_size(header_size_0, archive_size, C_SLOP)),
- (size_t) header_size_0 + archive_size);
+ header_size_0 + archive_size);
CHECK;
assert(input.limit()[0] == 0);
// Move all the bytes we read initially into the real buffer.
@@ -961,13 +961,13 @@
nentries = next_entry;
// place a limit on future CP growth:
- int generous = 0;
+ size_t generous = 0;
generous = add_size(generous, u->ic_count); // implicit name
generous = add_size(generous, u->ic_count); // outer
generous = add_size(generous, u->ic_count); // outer.utf8
generous = add_size(generous, 40); // WKUs, misc
generous = add_size(generous, u->class_count); // implicit SourceFile strings
- maxentries = add_size(nentries, generous);
+ maxentries = (uint)add_size(nentries, generous);
// Note that this CP does not include "empty" entries
// for longs and doubles. Those are introduced when
@@ -985,8 +985,9 @@
}
// Initialize *all* our entries once
- for (int i = 0 ; i < maxentries ; i++)
+ for (uint i = 0 ; i < maxentries ; i++) {
entries[i].outputIndex = REQUESTED_NONE;
+ }
initGroupIndexes();
// Initialize hashTab to a generous power-of-two size.
@@ -3680,21 +3681,22 @@
unpacker* debug_u;
-static bytes& getbuf(int len) { // for debugging only!
+static bytes& getbuf(size_t len) { // for debugging only!
static int bn = 0;
static bytes bufs[8];
bytes& buf = bufs[bn++ & 7];
- while ((int)buf.len < len+10)
+ while (buf.len < len + 10) {
buf.realloc(buf.len ? buf.len * 2 : 1000);
+ }
buf.ptr[0] = 0; // for the sake of strcat
return buf;
}
-char* entry::string() {
+const char* entry::string() {
bytes buf;
switch (tag) {
case CONSTANT_None:
- return (char*)"";
+ return "";
case CONSTANT_Signature:
if (value.b.ptr == null)
return ref(0)->string();
@@ -3714,26 +3716,28 @@
break;
default:
if (nrefs == 0) {
- buf = getbuf(20);
- sprintf((char*)buf.ptr, TAG_NAME[tag]);
+ return TAG_NAME[tag];
} else if (nrefs == 1) {
return refs[0]->string();
} else {
- char* s1 = refs[0]->string();
- char* s2 = refs[1]->string();
- buf = getbuf((int)strlen(s1) + 1 + (int)strlen(s2) + 4 + 1);
+ const char* s1 = refs[0]->string();
+ const char* s2 = refs[1]->string();
+ buf = getbuf(strlen(s1) + 1 + strlen(s2) + 4 + 1);
buf.strcat(s1).strcat(" ").strcat(s2);
if (nrefs > 2) buf.strcat(" ...");
}
}
- return (char*)buf.ptr;
+ return (const char*)buf.ptr;
}
void print_cp_entry(int i) {
entry& e = debug_u->cp.entries[i];
- char buf[30];
- sprintf(buf, ((uint)e.tag < CONSTANT_Limit)? TAG_NAME[e.tag]: "%d", e.tag);
- printf(" %d\t%s %s\n", i, buf, e.string());
+
+ if ((uint)e.tag < CONSTANT_Limit) {
+ printf(" %d\t%s %s\n", i, TAG_NAME[e.tag], e.string());
+ } else {
+ printf(" %d\t%d %s\n", i, e.tag, e.string());
+ }
}
void print_cp_entries(int beg, int end) {
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.pack200/share/native/common-unpack/unpack.h
--- a/jdk/src/jdk.pack200/share/native/common-unpack/unpack.h Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.pack200/share/native/common-unpack/unpack.h Mon Apr 06 10:35:43 2015 -0700
@@ -210,7 +210,7 @@
byte* rp; // read pointer (< rplimit <= input.limit())
byte* rplimit; // how much of the input block has been read?
julong bytes_read;
- int unsized_bytes_read;
+ size_t unsized_bytes_read;
// callback to read at least one byte, up to available input
typedef jlong (*read_input_fn_t)(unpacker* self, void* buf, jlong minlen, jlong maxlen);
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp
--- a/jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.pack200/share/native/common-unpack/utils.cpp Mon Apr 06 10:35:43 2015 -0700
@@ -81,7 +81,7 @@
int assert_failed(const char* p) {
char message[1<<12];
sprintf(message, "@assert failed: %s\n", p);
- fprintf(stdout, 1+message);
+ fprintf(stdout, "%s", 1+message);
breakpoint();
unpack_abort(message);
return 0;
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp
--- a/jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.pack200/share/native/common-unpack/zip.cpp Mon Apr 06 10:35:43 2015 -0700
@@ -84,7 +84,7 @@
}
// Write data to the ZIP output stream.
-void jar::write_data(void* buff, int len) {
+void jar::write_data(void* buff, size_t len) {
while (len > 0) {
int rc = (int)fwrite(buff, 1, len, jarfp);
if (rc <= 0) {
@@ -323,12 +323,12 @@
// Total number of disks (int)
header64[36] = (ushort)SWAP_BYTES(1);
header64[37] = 0;
- write_data(header64, (int)sizeof(header64));
+ write_data(header64, sizeof(header64));
}
// Write the End of Central Directory structure.
PRINTCR((2, "end-of-directory at %d\n", output_file_offset));
- write_data(header, (int)sizeof(header));
+ write_data(header, sizeof(header));
PRINTCR((2, "writing zip comment\n"));
// Write the comment.
@@ -590,7 +590,7 @@
zstream = NEW(z_stream, 1);
u->gzin = this;
u->read_input_fn = read_input_via_gzip;
- u->gzcrc = crc32(0L, Z_NULL, 0);
+ u->gzcrc = crc32(0, Z_NULL, 0);
}
void gunzip::start(int magic) {
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.pack200/share/native/common-unpack/zip.h
--- a/jdk/src/jdk.pack200/share/native/common-unpack/zip.h Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.pack200/share/native/common-unpack/zip.h Mon Apr 06 10:35:43 2015 -0700
@@ -68,8 +68,8 @@
}
// Private Methods
- void write_data(void* ptr, int len);
- void write_data(bytes& b) { write_data(b.ptr, (int)b.len); }
+ void write_data(void* ptr, size_t len);
+ void write_data(bytes& b) { write_data(b.ptr, b.len); }
void add_to_jar_directory(const char* fname, bool store, int modtime,
int len, int clen, uLong crc);
void write_jar_header(const char* fname, bool store, int modtime,
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.pack200/share/native/libunpack/jni.cpp
--- a/jdk/src/jdk.pack200/share/native/libunpack/jni.cpp Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.pack200/share/native/libunpack/jni.cpp Mon Apr 06 10:35:43 2015 -0700
@@ -292,7 +292,7 @@
if (uPtr->aborting()) {
THROW_IOE(uPtr->get_abort_message());
- return false;
+ return null;
}
// We have fetched all the files.
@@ -310,7 +310,7 @@
JNIEXPORT jlong JNICALL
Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) {
unpacker* uPtr = get_unpacker(env, pObj, false);
- CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL);
+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, 0);
size_t consumed = uPtr->input_consumed();
free_unpacker(env, pObj, uPtr);
return consumed;
@@ -320,6 +320,7 @@
Java_com_sun_java_util_jar_pack_NativeUnpack_setOption(JNIEnv *env, jobject pObj,
jstring pProp, jstring pValue) {
unpacker* uPtr = get_unpacker(env, pObj);
+ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false);
const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE);
CHECK_EXCEPTION_RETURN_VALUE(prop, false);
const char* value = env->GetStringUTFChars(pValue, JNI_FALSE);
diff -r d47c58140b41 -r 427f83353f73 jdk/src/jdk.pack200/share/native/unpack200/main.cpp
--- a/jdk/src/jdk.pack200/share/native/unpack200/main.cpp Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/src/jdk.pack200/share/native/unpack200/main.cpp Mon Apr 06 10:35:43 2015 -0700
@@ -149,31 +149,28 @@
return progname;
}
-static const char* usage_lines[] = {
- "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n",
- "\n",
- "Unpacking Options\n",
- " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n",
- " -r, --remove-pack-file remove input file after unpacking\n",
- " -v, --verbose increase program verbosity\n",
- " -q, --quiet set verbosity to lowest level\n",
- " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n",
- " -?, -h, --help print this message\n",
- " -V, --version print program version\n",
- " -J{X} Java VM argument (ignored)\n",
- null
-};
+#define USAGE_HEADER "Usage: %s [-opt... | --option=value]... x.pack[.gz] y.jar\n"
+#define USAGE_OPTIONS \
+ "\n" \
+ "Unpacking Options\n" \
+ " -H{h}, --deflate-hint={h} override transmitted deflate hint: true, false, or keep (default)\n" \
+ " -r, --remove-pack-file remove input file after unpacking\n" \
+ " -v, --verbose increase program verbosity\n" \
+ " -q, --quiet set verbosity to lowest level\n" \
+ " -l{F}, --log-file={F} output to the given log file, or '-' for standard output (default)\n" \
+ " -?, -h, --help print this message\n" \
+ " -V, --version print program version\n" \
+ " -J{X} Java VM argument (ignored)\n"
static void usage(unpacker* u, const char* progname, bool full = false) {
// WinMain does not set argv[0] to the progrname
progname = (progname != null) ? nbasename(progname) : "unpack200";
- for (int i = 0; usage_lines[i] != null; i++) {
- fprintf(u->errstrm, usage_lines[i], progname);
- if (!full) {
- fprintf(u->errstrm,
- "(For more information, run %s --help .)\n", progname);
- break;
- }
+
+ fprintf(u->errstrm, USAGE_HEADER, progname);
+ if (full) {
+ fprintf(u->errstrm, USAGE_OPTIONS);
+ } else {
+ fprintf(u->errstrm, "(For more information, run %s --help .)\n", progname);
}
}
diff -r d47c58140b41 -r 427f83353f73 jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/ProblemList.txt Mon Apr 06 10:35:43 2015 -0700
@@ -283,9 +283,6 @@
# jdk_jdi
-# 6983531
-com/sun/jdi/BadHandshakeTest.java linux-all,windows-all
-
# 8004127
com/sun/jdi/RedefineImplementor.sh generic-all
diff -r d47c58140b41 -r 427f83353f73 jdk/test/TEST.groups
--- a/jdk/test/TEST.groups Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/TEST.groups Mon Apr 06 10:35:43 2015 -0700
@@ -38,7 +38,9 @@
:jdk_time \
:jdk_security \
:jdk_text \
- :core_tools
+ :core_tools \
+ :jdk_other \
+ :jdk_svc
###############################################################################
#
diff -r d47c58140b41 -r 427f83353f73 jdk/test/com/sun/jdi/BadHandshakeTest.java
--- a/jdk/test/com/sun/jdi/BadHandshakeTest.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/com/sun/jdi/BadHandshakeTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -21,22 +21,15 @@
* questions.
*/
-/* @test
- * @bug 6306165 6432567
- * @summary Check that a bad handshake doesn't cause a debuggee to abort
- * @library /lib/testlibrary
- *
- * @build jdk.testlibrary.* VMConnection BadHandshakeTest Exit0
- * @run driver BadHandshakeTest
- *
- */
import java.net.Socket;
-import java.net.InetAddress;
+
import com.sun.jdi.Bootstrap;
import com.sun.jdi.VirtualMachine;
import com.sun.jdi.event.*;
import com.sun.jdi.connect.Connector;
import com.sun.jdi.connect.AttachingConnector;
+import com.sun.jdi.connect.Connector.Argument;
+
import java.util.Map;
import java.util.List;
import java.util.Iterator;
@@ -46,13 +39,22 @@
import jdk.testlibrary.Utils;
import jdk.testlibrary.ProcessTools;
+/* @test
+ * @bug 6306165 6432567
+ * @summary Check that a bad handshake doesn't cause a debuggee to abort
+ * @library /lib/testlibrary
+ *
+ * @build jdk.testlibrary.* VMConnection BadHandshakeTest Exit0
+ * @run driver BadHandshakeTest
+ */
public class BadHandshakeTest {
+
/*
* Find a connector by name
*/
private static Connector findConnector(String name) {
- List connectors = Bootstrap.virtualMachineManager().allConnectors();
- Iterator iter = connectors.iterator();
+ List connectors = Bootstrap.virtualMachineManager().allConnectors();
+ Iterator iter = connectors.iterator();
while (iter.hasNext()) {
Connector connector = (Connector)iter.next();
if (connector.name().equals(name)) {
@@ -65,7 +67,7 @@
/*
* Launch a server debuggee with the given address
*/
- private static Process launch(String address, String class_name) throws Exception {
+ private static LaunchResult launch(String address, String class_name) throws Exception {
String[] args = VMConnection.insertDebuggeeVMOptions(new String[] {
"-agentlib:jdwp=transport=dt_socket" +
",server=y" + ",suspend=y" + ",address=" + address,
@@ -75,6 +77,7 @@
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
final AtomicBoolean success = new AtomicBoolean();
+ final AtomicBoolean bindFailed = new AtomicBoolean();
Process p = ProcessTools.startProcess(
class_name,
pb,
@@ -83,13 +86,17 @@
// Listening for transport dt_socket at address: xxxxx
// which shows the debuggee is ready to accept connections.
success.set(line.contains("Listening for transport dt_socket at address:"));
+ // If the first line contains 'Address already in use'
+ // that means the debuggee has failed to start due to busy port
+ bindFailed.set(line.contains("Address already in use"));
return true;
},
Integer.MAX_VALUE,
TimeUnit.MILLISECONDS
);
- return success.get() ? p : null;
+ return new LaunchResult(success.get() ? p : null,
+ bindFailed.get());
}
/*
@@ -99,14 +106,20 @@
* - verify we saw no error
*/
public static void main(String args[]) throws Exception {
- int port = Utils.getFreePort();
-
- String address = String.valueOf(port);
-
- // launch the server debuggee
- Process process = launch(address, "Exit0");
- if (process == null) {
- throw new RuntimeException("Unable to start debugee");
+ // Launch the server debuggee
+ int port = 0;
+ Process process = null;
+ while (process == null) {
+ port = Utils.getFreePort();
+ String address = String.valueOf(port);
+ LaunchResult launchResult = launch(address, "Exit0");
+ process = launchResult.getProcess();
+ if (launchResult.isBindFailed()) {
+ System.out.println("Port " + port + " already in use. Trying to restart debuggee with a new one...");
+ Thread.sleep(100);
+ } else if (process == null ) {
+ throw new RuntimeException("Unable to start debugee");
+ }
}
// Connect to the debuggee and handshake with garbage
@@ -119,9 +132,9 @@
s.getOutputStream().write("JDWP-".getBytes("UTF-8"));
- // attach to server debuggee and resume it so it can exit
+ // Attach to server debuggee and resume it so it can exit
AttachingConnector conn = (AttachingConnector)findConnector("com.sun.jdi.SocketAttach");
- Map conn_args = conn.defaultArguments();
+ Map conn_args = conn.defaultArguments();
Connector.IntegerArgument port_arg =
(Connector.IntegerArgument)conn_args.get("port");
port_arg.setValue(port);
@@ -143,4 +156,24 @@
process.waitFor();
}
+ private static class LaunchResult {
+
+ private final Process p;
+ private final boolean bindFailed;
+
+ public LaunchResult(Process p, boolean bindFailed) {
+ this.p = p;
+ this.bindFailed = bindFailed;
+ }
+
+ public Process getProcess() {
+ return p;
+ }
+
+ public boolean isBindFailed() {
+ return bindFailed;
+ }
+
+ }
+
}
diff -r d47c58140b41 -r 427f83353f73 jdk/test/com/sun/nio/sctp/SctpMultiChannel/SendFailed.java
--- a/jdk/test/com/sun/nio/sctp/SctpMultiChannel/SendFailed.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/com/sun/nio/sctp/SctpMultiChannel/SendFailed.java Mon Apr 06 10:35:43 2015 -0700
@@ -43,11 +43,16 @@
void test(String[] args) throws IOException {
SocketAddress address = null;
+ String os = System.getProperty("os.name").toLowerCase();
if (!Util.isSCTPSupported()) {
out.println("SCTP protocol is not supported");
out.println("Test cannot be run");
return;
+ } else if (os.startsWith("sunos")) {
+ out.println("Test not supported on Solaris");
+ out.println("Test cannot be run");
+ return;
}
System.out.println("remote address: " + remoteAddress);
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/lang/ProcessBuilder/Basic.java
--- a/jdk/test/java/lang/ProcessBuilder/Basic.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/java/lang/ProcessBuilder/Basic.java Mon Apr 06 10:35:43 2015 -0700
@@ -27,6 +27,7 @@
* 5026830 5023243 5070673 4052517 4811767 6192449 6397034 6413313
* 6464154 6523983 6206031 4960438 6631352 6631966 6850957 6850958
* 4947220 7018606 7034570 4244896 5049299 8003488 8054494 8058464
+ * 8067796
* @summary Basic tests for Process and Environment Variable code
* @run main/othervm/timeout=300 Basic
* @run main/othervm/timeout=300 -Djdk.lang.Process.launchMechanism=fork Basic
@@ -2387,6 +2388,56 @@
} catch (Throwable t) { unexpected(t); }
//----------------------------------------------------------------
+ // Check that Process.waitFor(timeout, null) throws NPE.
+ //----------------------------------------------------------------
+ try {
+ List childArgs = new ArrayList(javaChildArgs);
+ childArgs.add("sleep");
+ final Process p = new ProcessBuilder(childArgs).start();
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(10L, null));
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(0L, null));
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(-1L, null));
+ // Terminate process and recheck after it exits
+ p.destroy();
+ p.waitFor();
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(10L, null));
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(0L, null));
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(-1L, null));
+ } catch (Throwable t) { unexpected(t); }
+
+ //----------------------------------------------------------------
+ // Check that default implementation of Process.waitFor(timeout, null) throws NPE.
+ //----------------------------------------------------------------
+ try {
+ List childArgs = new ArrayList(javaChildArgs);
+ childArgs.add("sleep");
+ final Process proc = new ProcessBuilder(childArgs).start();
+ final DelegatingProcess p = new DelegatingProcess(proc);
+
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(10L, null));
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(0L, null));
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(-1L, null));
+ // Terminate process and recheck after it exits
+ p.destroy();
+ p.waitFor();
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(10L, null));
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(0L, null));
+ THROWS(NullPointerException.class,
+ () -> p.waitFor(-1L, null));
+ } catch (Throwable t) { unexpected(t); }
+
+ //----------------------------------------------------------------
// Check the default implementation for
// Process.waitFor(long, TimeUnit)
//----------------------------------------------------------------
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/nio/Buffer/genBasic.sh
--- a/jdk/test/java/nio/Buffer/genBasic.sh Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/java/nio/Buffer/genBasic.sh Mon Apr 06 10:35:43 2015 -0700
@@ -1,7 +1,7 @@
#! /bin/sh
#
-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2015, 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
@@ -23,7 +23,7 @@
# questions.
#
-javac -d . ../../../../make/tools/src/build/tools/spp/Spp.java
+javac -d . ../../../../make/src/classes/build/tools/spp/Spp.java
gen() {
java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3 Basic$2.java
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/nio/Buffer/genCopyDirectMemory.sh
--- a/jdk/test/java/nio/Buffer/genCopyDirectMemory.sh Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/java/nio/Buffer/genCopyDirectMemory.sh Mon Apr 06 10:35:43 2015 -0700
@@ -1,7 +1,7 @@
#! /bin/sh
#
-# Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2015, 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
@@ -23,7 +23,7 @@
# questions.
#
-javac -d . ../../../../make/tools/src/build/tools/spp/Spp.java > Spp.java
+javac -d . ../../../../make/src/classes/build/tools/spp/Spp.java > Spp.java
gen() {
java build.tools.spp.Spp -K$1 -Dtype=$1 -DType=$2 -DFulltype=$3CopyDirect$2Memory.java
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java
--- a/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/java/nio/channels/AsynchronousSocketChannel/Basic.java Mon Apr 06 10:35:43 2015 -0700
@@ -25,7 +25,6 @@
* @bug 4607272 6842687 6878369 6944810 7023403
* @summary Unit test for AsynchronousSocketChannel
* @run main Basic -skipSlowConnectTest
- * @key intermittent
*/
import java.nio.ByteBuffer;
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/nio/channels/Selector/Wakeup.java
--- a/jdk/test/java/nio/channels/Selector/Wakeup.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/java/nio/channels/Selector/Wakeup.java Mon Apr 06 10:35:43 2015 -0700
@@ -25,7 +25,6 @@
* @bug 6405995
* @summary Unit test for selector wakeup and interruption
* @library ..
- * @key intermittent
*/
import java.io.*;
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/nio/file/Files/InterruptCopy.java
--- a/jdk/test/java/nio/file/Files/InterruptCopy.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/java/nio/file/Files/InterruptCopy.java Mon Apr 06 10:35:43 2015 -0700
@@ -25,7 +25,6 @@
* @bug 4313887 6993267
* @summary Unit test for Sun-specific ExtendedCopyOption.INTERRUPTIBLE option
* @library ..
- * @key intermittent
*/
import java.nio.file.*;
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/security/KeyStore/PKCS12/WriteP12Test.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/KeyStore/PKCS12/WriteP12Test.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,371 @@
+/*
+ * Copyright (c) 2003, 2015, 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 static java.lang.System.out;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.security.Key;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Enumeration;
+
+/*
+ * @test
+ * @bug 8048618
+ * @summary Write different types p12 key store to Check the write related
+ * APIs.
+ * @run main WriteP12Test
+ */
+
+public class WriteP12Test {
+
+ private static final String IN_KEYSTORE_TYPE = "jks";
+ private static final String IN_KEYSTORE_PRV = "SUN";
+
+ private static final String IN_KEYSTORE_ENDUSER = "keystoreEU.jks.data";
+ private static final String IN_KEYSTORE_CA = "keystoreCA.jks.data";
+ private static final String OUT_KEYSTORE = "outKeyStore.p12";
+
+ private static final String IN_STORE_PASS = "storepass";
+ private static final String IN_KEY_PASS = "keypass";
+
+ private static final String CERT_PATH = System.getProperty("test.src", ".")
+ + File.separator + "certs" + File.separator + "writeP12"
+ + File.separator;
+
+ private static final String CA_CERT_STR = "-----BEGIN CERTIFICATE-----\n"
+ + "MIIDFzCCAf8CBD8+0nAwDQYJKoZIhvcNAQEFBQAwUDELMAkGA1UEBhMCV\n"
+ + "VMxETAPBgNVBAoTCEphdmFTb2Z0MRUwEwYDVQQLEwxTZWN1cml0eSBTUU\n"
+ + "UxFzAVBgNVBAMTDlBLQ1MxMiBUZXN0IENBMB4XDTAzMDgxNzAwNTUxMlo\n"
+ + "XDTEzMDgxNDAwNTUxMlowUDELMAkGA1UEBhMCVVMxETAPBgNVBAoTCEph\n"
+ + "dmFTb2Z0MRUwEwYDVQQLEwxTZWN1cml0eSBTUUUxFzAVBgNVBAMTDlBLQ\n"
+ + "1MxMiBUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQ\n"
+ + "EAk7Sh+K/yGsmJacZnjfkZfuWxGNJCPW0q69exwoRP+eBHMQwG00yi9aL\n"
+ + "SsZAqNpJSCDvpgySOAUmBd+f8WFhHqJfRVREVfv3mradDKZCjhqtsUI7I\n"
+ + "wRTYYy9clFkeeK4dHaxbuFMPpUu7yQfwSTXgvOA/UJ4kJuGtaYAdTJI4e\n"
+ + "f1mUASo6+dea0UZA/FHCuV7O6z3hr5VHlyhJL2/o/8M5tGBTBISODJSnn\n"
+ + "GNBvtQLNHnWYvs470UAE2BtuCGYh1V/3HAH1tRirS3MBBcb1XnIkiiXR3\n"
+ + "tjaBSB+XhoCfuG8KtInXXFaAnvKfY9mYFw6VJt9JYQpY2VDC7281/Pbz0\n"
+ + "dQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBzXZ8zHWrnC8/E+N/n2Czhx\n"
+ + "i18YQc2LPWBDLYTTxoFEazWmYLv1k/JT7Nta1qu1quvxXJ4uV1XHbd9NF\n"
+ + "AJWKwtFQEpfv4o6I7qWUPoxnfA+jyqKXxv27z25tzt+Y4xOEhqvO03G0Q\n"
+ + "imhkiNt9MF7L69y2U0/U73+uFNGzdAEDiI9EibvICiOnr1TeQ5GekK3Yb\n"
+ + "k5qe3lviMZPkkSXepTJI8m0AiXCji+eXj97jVLeH+RxeBchBY+uELrqUr\n"
+ + "sVOVWh7IBCqC/V7FqUTkmD1IFlzkkinatpl42s1MbhJId2yQkzaeBRc\n"
+ + "suE63bDEtuRWp9ynMO3QA4Yu85uBRWGzQ1Di\n"
+ + "-----END CERTIFICATE-----";
+ private static final String LEAD_CERT = "-----BEGIN CERTIFICATE-----\n"
+ + "MIICwDCCAaigAwIBAgIEPz7S1jANBgkqhkiG9w0BAQQFADBQMQswCQYDV\n"
+ + "QQGEwJVUzERMA8GA1UEChMISmF2YVNvZnQxFTATBgNVBAsTDFNlY3VyaX\n"
+ + "R5IFNRRTEXMBUGA1UEAxMOUEtDUzEyIFRlc3QgQ0EwHhcNMDAwODA5MDc\n"
+ + "wMDAwWhcNMTAwODA3MDcwMDAwWjBSMQswCQYDVQQGEwJVUzERMA8GA1UE\n"
+ + "ChMISmF2YVNvZnQxFTATBgNVBAsTDFNlY3VyaXR5IFNRRTEZMBcGA1UEA\n"
+ + "xMQUEtDUzEyIFRlc3QgTGVhZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgY\n"
+ + "kCgYEAzq9X2USz/WjDhT+jUyZWqB5h4A33tS11YqH5qYvqjTXjcUI6gOp\n"
+ + "moXMafDG9RHRlIccvp51xLp7Ap3WMrv411lWBttqtZi5c1/DEC1cEM/Sl\n"
+ + "PCk1r2zFbkJu7QKieXeMcrjZEo6LcBHMwQjIpI+up9cr3VjuyqG/olQkU\n"
+ + "mXVuS0CAwEAAaMkMCIwDwYDVR0PAQH/BAUDAweAADAPBgNVHRMBAf8EBT\n"
+ + "ADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBhbuim98TWmtv9vSldRE7RvQ8\n"
+ + "FlS0TyZVO7kcSNtfCUE4R76J1ElN74Koc5pQnUtduLeQJs2ao/mEcCZsE\n"
+ + "zVcwI3mSZrSzPhc8s7w5gOQA4TUwVLSSjKgBCaZ7R3+qJ3QeqPJ5O6sFz\n"
+ + "pvBYkgSa4MWptK41jbmT8cwZQJXFCi8WxFFJ+p97F1Ppm3LgmYmtiUP4M\n"
+ + "ZQwOBvpTZWXU0WrqFXpzWQx0mg4SX19fZm4nLcJAerCEUphf8ILagtpQM\n"
+ + "EErT3/jg6mfCdT3Rj055QXPfF4OiRFevPF5a1fZgrCePCukRQZcd7s8K5\n"
+ + "OBIaryuM0MdFtlzxi6XWeUNpVFFHURcy\n"
+ + "-----END CERTIFICATE-----";
+ private static final String END_CERT = "-----BEGIN CERTIFICATE-----\n"
+ + "MIICNjCCAZ+gAwIBAgIEPz7WtzANBgkqhkiG9w0BAQQFADBSMQswCQYDV\n"
+ + "QQGEwJVUzERMA8GA1UEChMISmF2YVNvZnQxFTATBgNVBAsTDFNlY3VyaX\n"
+ + "R5IFNRRTEZMBcGA1UEAxMQUEtDUzEyIFRlc3QgTGVhZDAeFw0wMDA4MDk\n"
+ + "wNzAwMDBaFw0xMDA4MDcwNzAwMDBaMFgxCzAJBgNVBAYTAlVTMREwDwYD\n"
+ + "VQQKEwhKYXZhU29mdDEVMBMGA1UECxMMU2VjdXJpdHkgU1FFMR8wHQYDV\n"
+ + "QQDExZQS0NTMTIgVGVzdCBFbmQgVXNlciAxMIGfMA0GCSqGSIb3DQEBAQ\n"
+ + "UAA4GNADCBiQKBgQDIKomSYomDzH/V63eDQEG7od0DLcnnVZ81pbWhDss\n"
+ + "8gHV2m8pADdRqdihBmnSQEaMW4D3uZ4sFE1LtkQls6hjd7SdOsG5Y24L8\n"
+ + "15jot9a2JcB73H8H0VKirrObL5BZdt7BtASPDnYtW4Spt++YjDoJFxyF0\n"
+ + "HchkavzXaVTlexakwIDAQABoxMwETAPBgNVHQ8BAf8EBQMDB4AAMA0GCS\n"
+ + "qGSIb3DQEBBAUAA4GBAIFA3JXEmb9AXn3RD7t+Mn6DoyVDIy5jsn6xOKT\n"
+ + "JV25I0obpDUzgw4QaAMmM0ZvusOmZ2wZNS8MtyTUgdANyakbzn5SdxbTy\n"
+ + "TLEqQsFbX8UVC38fx5ZM6ExA5YSAvgmXudZpOVC0ATccoZS3JFU8CxSfW\n"
+ + "+Q3IC2MLh+QTg3hUJ5b\n-----END CERTIFICATE-----";
+
+ private final Certificate testerCert;
+ private final Certificate testLeadCert;
+ private final Certificate caCert;
+
+ WriteP12Test() throws CertificateException {
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+ caCert = cf.generateCertificate(new ByteArrayInputStream(CA_CERT_STR
+ .getBytes()));
+ testLeadCert = cf.generateCertificate(new ByteArrayInputStream(
+ LEAD_CERT.getBytes()));
+ testerCert = cf.generateCertificate(new ByteArrayInputStream(END_CERT
+ .getBytes()));
+ }
+
+ public static void main(String[] args) throws CertificateException,
+ UnrecoverableKeyException, KeyStoreException,
+ NoSuchProviderException, NoSuchAlgorithmException, IOException {
+ WriteP12Test jstest = new WriteP12Test();
+ out.println("test WriteP12CertChain");
+ /*
+ * WriteP12CertChain: This test creates a p12 keystore contains one
+ * entry with private key and a certificate chains contains three
+ * certificates in the order of user->lead->ca. This case expects to
+ * pass.
+ */
+ jstest.test(new Certificate[] { jstest.testerCert, jstest.testLeadCert,
+ jstest.caCert }, IN_KEYSTORE_ENDUSER, "pkcs12testenduser1",
+ "pass", "pass");
+
+ /*
+ * WriteP12CertChainBad: same as WriteP12CertChain but chains order is
+ * user-ca-lead, the order is wrong so expects to fail.
+ */
+ out.println("test WriteP12CertChainBad");
+ try {
+ jstest.test(new Certificate[] { jstest.testerCert, jstest.caCert,
+ jstest.testLeadCert }, IN_KEYSTORE_ENDUSER,
+ "pkcs12testenduser1", "pass", "pass");
+ throw new RuntimeException(
+ " Certificate chain is not valid, test should not pass."
+ + " Test failed.");
+ } catch (KeyStoreException e) {
+ e.printStackTrace();
+ out.println(" Certificate chain is not valid,exception is"
+ + " expected. Test passed.");
+ }
+ /*
+ * WriteP12PrivateKey:This test creates a p12 contains a self-signed
+ * cert and private key,expects no exception
+ */
+ out.println("test WriteP12PrivateKey");
+ jstest.test(null, IN_KEYSTORE_ENDUSER, "pkcs12testenduser1", "pass",
+ "pass");
+
+ /*
+ * WriteP12TwoEntry: This test creates a p12 keystore with different
+ * storepass and keypass, and contains two entries.
+ */
+ out.println("test WriteP12TwoEntry");
+ jstest.testTwoEntry(IN_KEYSTORE_ENDUSER, IN_KEYSTORE_CA,
+ "pkcs12testenduser1", "pass", "pass");
+ /*
+ * WriteP12TwoPass: This test creates a p12 keystore with different
+ * storepass and keypass, and contains one entry with private key and a
+ * certificate
+ */
+ out.println("test WriteP12TwoPass");
+ jstest.test(null, IN_KEYSTORE_CA, "pkcs12testCA", "storepass",
+ "keypass");
+ }
+
+ private void test(Certificate certs[], String inKeyStorePath,
+ String userAlias, String outStorePass, String outKeyPass)
+ throws KeyStoreException, NoSuchProviderException, IOException,
+ CertificateException, UnrecoverableKeyException,
+ NoSuchAlgorithmException {
+ // init output key store
+ KeyStore outputKeyStore = KeyStore.getInstance("pkcs12", "SunJSSE");
+ outputKeyStore.load(null, null);
+ try (FileOutputStream fout = new FileOutputStream(OUT_KEYSTORE)) {
+ // KeyStore have encoded by Base64.getMimeEncoder().encode(),need
+ // decode first.
+ byte[] input = Files.readAllBytes(Paths.get(CERT_PATH,
+ inKeyStorePath));
+ ByteArrayInputStream arrayIn = new ByteArrayInputStream(Base64
+ .getMimeDecoder().decode(input));
+ // input key store
+ KeyStore inputKeyStore = KeyStore.getInstance(IN_KEYSTORE_TYPE,
+ IN_KEYSTORE_PRV);
+ inputKeyStore.load(arrayIn, IN_STORE_PASS.toCharArray());
+ // add key/certificate to output key store
+ Key key = inputKeyStore
+ .getKey(userAlias, IN_KEY_PASS.toCharArray());
+ out.println("Input Key Algorithm " + key.getAlgorithm());
+ out.println("====Input Certs=====");
+ if (certs == null) {
+ certs = new Certificate[] { inputKeyStore
+ .getCertificate(userAlias) };
+ }
+ for (Certificate cert : certs) {
+ out.println(((X509Certificate) cert).getSubjectDN());
+ }
+ outputKeyStore.setKeyEntry(userAlias, key,
+ outKeyPass.toCharArray(), certs);
+ Certificate retCerts[] = outputKeyStore
+ .getCertificateChain(userAlias);
+ out.println("====Output Certs=====");
+ for (Certificate retCert : retCerts) {
+ out.println(((X509Certificate) retCert).getSubjectDN());
+ }
+ out.println("====Output Key Algorithm=====");
+ Key outKey = outputKeyStore.getKey(userAlias,
+ outKeyPass.toCharArray());
+ out.println(outKey.getAlgorithm());
+
+ if (!key.equals(outKey)) {
+ throw new RuntimeException("key don't match");
+ }
+ if (!Arrays.equals(certs, retCerts)) {
+ throw new RuntimeException("certs don't match");
+ }
+ // save output
+ outputKeyStore.store(fout, outStorePass.toCharArray());
+ // test output
+ testKeyStore(outputKeyStore, outKeyPass.toCharArray());
+ }
+ }
+
+ private void testTwoEntry(String inKeyStoreOnePath,
+ String inKeyStoreTwoPath, String userAlias, String outStorePass,
+ String outKeyPass) throws KeyStoreException,
+ NoSuchProviderException, NoSuchAlgorithmException,
+ CertificateException, IOException, UnrecoverableKeyException {
+ // initial KeyStore
+ KeyStore outputKeyStore = KeyStore.getInstance("pkcs12", "SunJSSE");
+ try (FileOutputStream fout = new FileOutputStream(OUT_KEYSTORE);) {
+ outputKeyStore.load(null, null);
+ KeyStore inputKeyStoreOne, inputKeyStoreTwo;
+ inputKeyStoreOne = KeyStore.getInstance(IN_KEYSTORE_TYPE,
+ IN_KEYSTORE_PRV);
+ // KeyStore have encoded by Base64.getMimeEncoder().encode(),need
+ // decode first.
+ byte[] inputBytes = Files.readAllBytes(Paths.get(CERT_PATH,
+ inKeyStoreOnePath));
+ ByteArrayInputStream arrayIn = new ByteArrayInputStream(Base64
+ .getMimeDecoder().decode(inputBytes));
+ // input key store
+ inputKeyStoreOne.load(arrayIn, IN_STORE_PASS.toCharArray());
+
+ inputBytes = Files.readAllBytes(Paths.get(CERT_PATH,
+ inKeyStoreTwoPath));
+ arrayIn = new ByteArrayInputStream(Base64.getMimeDecoder().decode(
+ inputBytes));
+ inputKeyStoreTwo = KeyStore.getInstance(IN_KEYSTORE_TYPE,
+ IN_KEYSTORE_PRV);
+ inputKeyStoreTwo.load(arrayIn, IN_STORE_PASS.toCharArray());
+
+ // add key/certificate to output key store
+ out.println("====First Entry=====");
+ Key inputKey = inputKeyStoreOne.getKey(userAlias,
+ IN_KEY_PASS.toCharArray());
+ Certificate cert = inputKeyStoreOne.getCertificate(userAlias);
+ Certificate certs[] = new Certificate[1];
+ certs[0] = cert;
+
+ out.println("====Input1 Key=====");
+ out.println(inputKey.getAlgorithm());
+ out.println("====Input1 Certs=====");
+ out.println("Certificate :");
+ out.println(((X509Certificate) cert).getSubjectDN());
+ outputKeyStore.setKeyEntry("USER", inputKey,
+ outKeyPass.toCharArray(), certs);
+ out.println("====Second Entry=====");
+ String caAlias = "pkcs12testca";
+ inputKey = inputKeyStoreTwo.getKey(caAlias,
+ IN_KEY_PASS.toCharArray());
+ cert = inputKeyStoreTwo.getCertificate(caAlias);
+ certs[0] = cert;
+ out.println("====Input2 Key=====");
+ out.println(inputKey.getAlgorithm());
+ out.println("====Input2 Certs=====");
+ out.println("Certificate :");
+ out.println(((X509Certificate) cert).getSubjectDN());
+ outputKeyStore.setKeyEntry("CA", inputKey,
+ outKeyPass.toCharArray(), certs);
+ // save output
+ outputKeyStore.store(fout, outStorePass.toCharArray());
+ // test output
+ testKeyStore(outputKeyStore, outKeyPass.toCharArray());
+ }
+ }
+
+ private void testKeyStore(KeyStore inputKeyStore, char[] keypass)
+ throws KeyStoreException, UnrecoverableKeyException,
+ NoSuchAlgorithmException {
+ out.println("========== Key Store ==========");
+ out.println("getProvider : " + inputKeyStore.getProvider());
+ out.println("getType : " + inputKeyStore.getType());
+ out.println("getDefaultType : " + KeyStore.getDefaultType());
+
+ int idx = 0;
+ Enumeration e = inputKeyStore.aliases();
+ String alias;
+ while (e.hasMoreElements()) {
+ alias = e.nextElement();
+ if (!inputKeyStore.containsAlias(alias)) {
+ throw new RuntimeException("Alias not found");
+ }
+ out.println("Alias " + idx + " : " + alias);
+ out.println("getCreationDate : "
+ + inputKeyStore.getCreationDate(alias));
+ X509Certificate cert = (X509Certificate) inputKeyStore
+ .getCertificate(alias);
+ out.println("getCertificate : " + cert.getSubjectDN());
+ String retAlias = inputKeyStore.getCertificateAlias(cert);
+ if (!retAlias.equals(alias)) {
+ throw new RuntimeException("Alias mismatch, actually "
+ + retAlias + ", expected " + alias);
+ }
+ out.println("getCertificateAlias : " + retAlias);
+ Certificate[] certs = inputKeyStore.getCertificateChain(alias);
+ int i = 0;
+ for (Certificate certification : certs) {
+ out.println("getCertificateChain " + i
+ + ((X509Certificate) certification).getSubjectDN());
+ i++;
+ }
+ if (inputKeyStore.isCertificateEntry(alias)) {
+ throw new RuntimeException(
+ "inputKeystore should not be certEntry because this"
+ + " keystore only contain key pair entries.");
+ }
+ if (!inputKeyStore.isKeyEntry(alias)) {
+ throw new RuntimeException("Entry type unknown.");
+ }
+ idx++;
+ }
+ int size = inputKeyStore.size();
+ if (idx != size) {
+ throw new RuntimeException("Size not match, actually " + idx
+ + ", expected " + size);
+ }
+ }
+
+}
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/security/KeyStore/PKCS12/certs/writeP12/keystoreCA.jks.data
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/KeyStore/PKCS12/certs/writeP12/keystoreCA.jks.data Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,38 @@
+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
\ No newline at end of file
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/security/KeyStore/PKCS12/certs/writeP12/keystoreEU.jks.data
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/KeyStore/PKCS12/certs/writeP12/keystoreEU.jks.data Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,79 @@
+/u3+7QAAAAIAAAADAAAAAgAMcGtjczEydGVzdGNhAAAA9w18bwQABVguNTA5AAADGzCCAxcwggH/
+AgQ/PtJwMA0GCSqGSIb3DQEBBQUAMFAxCzAJBgNVBAYTAlVTMREwDwYDVQQKEwhKYXZhU29mdDEV
+MBMGA1UECxMMU2VjdXJpdHkgU1FFMRcwFQYDVQQDEw5QS0NTMTIgVGVzdCBDQTAeFw0wMzA4MTcw
+MDU1MTJaFw0xMzA4MTQwMDU1MTJaMFAxCzAJBgNVBAYTAlVTMREwDwYDVQQKEwhKYXZhU29mdDEV
+MBMGA1UECxMMU2VjdXJpdHkgU1FFMRcwFQYDVQQDEw5QS0NTMTIgVGVzdCBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJO0ofiv8hrJiWnGZ435GX7lsRjSQj1tKuvXscKET/ngRzEM
+BtNMovWi0rGQKjaSUgg76YMkjgFJgXfn/FhYR6iX0VURFX795q2nQymQo4arbFCOyMEU2GMvXJRZ
+HniuHR2sW7hTD6VLu8kH8Ek14LzgP1CeJCbhrWmAHUySOHn9ZlAEqOvnXmtFGQPxRwrlezus94a+
+VR5coSS9v6P/DObRgUwSEjgyUp5xjQb7UCzR51mL7OO9FABNgbbghmIdVf9xwB9bUYq0tzAQXG9V
+5yJIol0d7Y2gUgfl4aAn7hvCrSJ11xWgJ7yn2PZmBcOlSbfSWEKWNlQwu9vNfz289HUCAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAc12fMx1q5wvPxPjf59gs4cYtfGEHNiz1gQy2E08aBRGs1pmC79ZP
+yU+zbWtartarr8VyeLldVx23fTRQCVisLRUBKX7+KOiO6llD6MZ3wPo8qil8b9u89ubc7fmOMThI
+arztNxtEIpoZIjbfTBey+vctlNP1O9/rhTRs3QBA4iPRIm7yAojp69U3kORnpCt2G5Oant5b4jGT
+5JEl3qUySPJtAIlwo4vnl4/e41S3h/kcXgXIQWPrhC66lK7FTlVoeyAQqgv1exalE5Jg9SBZc5JI
+p2raZeNrNTG4SSHdskJM2ngUXLLhOt2wxLbkVqfcpzDt0AOGLvObgUVhs0NQ4gAAAAIADnBrY3Mx
+MnRlc3RsZWFkAAAA9w1+meMABVguNTA5AAACxDCCAsAwggGooAMCAQICBD8+0tYwDQYJKoZIhvcN
+AQEEBQAwUDELMAkGA1UEBhMCVVMxETAPBgNVBAoTCEphdmFTb2Z0MRUwEwYDVQQLEwxTZWN1cml0
+eSBTUUUxFzAVBgNVBAMTDlBLQ1MxMiBUZXN0IENBMB4XDTAwMDgwOTA3MDAwMFoXDTEwMDgwNzA3
+MDAwMFowUjELMAkGA1UEBhMCVVMxETAPBgNVBAoTCEphdmFTb2Z0MRUwEwYDVQQLEwxTZWN1cml0
+eSBTUUUxGTAXBgNVBAMTEFBLQ1MxMiBUZXN0IExlYWQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBAM6vV9lEs/1ow4U/o1MmVqgeYeAN97UtdWKh+amL6o0143FCOoDqZqFzGnwxvUR0ZSHHL6ed
+cS6ewKd1jK7+NdZVgbbarWYuXNfwxAtXBDP0pTwpNa9sxW5Cbu0Conl3jHK42RKOi3ARzMEIyKSP
+rqfXK91Y7sqhv6JUJFJl1bktAgMBAAGjJDAiMA8GA1UdDwEB/wQFAwMHgAAwDwYDVR0TAQH/BAUw
+AwEB/zANBgkqhkiG9w0BAQQFAAOCAQEAYW7opvfE1prb/b0pXURO0b0PBZUtE8mVTu5HEjbXwlBO
+Ee+idRJTe+CqHOaUJ1LXbi3kCbNmqP5hHAmbBM1XMCN5kma0sz4XPLO8OYDkAOE1MFS0koyoAQmm
+e0d/qid0HqjyeTurBc6bwWJIEmuDFqbSuNY25k/HMGUCVxQovFsRRSfqfexdT6Zty4JmJrYlD+DG
+UMDgb6U2Vl1NFq6hV6c1kMdJoOEl9fX2ZuJy3CQHqwhFKYX/CC2oLaUDBBK09/44OpnwnU90Y9Oe
+UFz3xeDokRXrzxeWtX2YKwnjwrpEUGXHe7PCuTgSGq8rjNDHRbZc8Yul1nlDaVRRR1EXMgAAAAEA
+EnBrY3MxMnRlc3RlbmR1c2VyMQAAAPcNgTivAAACuTCCArUwDgYKKwYBBAEqAhEBAQUABIICoU6N
+bD6qkNDM8KJFHCTHUevURAV8SUuzzBwsfYC0tEDMa2zGNUEvrmgyM3b5z7qR8XbTZvVBFJJLp3Jx
+HmQpg0vLltDFFIPiVgRVcUEDPSmks1KP/bP/mE1uos31R6VyfNMGS3JnQblcSipcB893NrFFXNu2
+PUPjKCC9GrQZAmSM78BBTrwWD/Yd4rKcVh57DLKtUySoF29qXthusJjhSaqRZERaMV6egviE5+W8
+f8ppTYLx2gJmOyi9edJEdHxMcPzRvWgxlmUqUCDg0KVsosbxjjJKcmJ9b1KWuadKyAYkqxSDi8sx
+2iwEQW3PQjLGBVHeQNntUF1wapp21sD1lVmDV3+61+fIphAUVRQXjmoYsEhrTc93IkDtQWgfJsgz
+xjVVDbcy29VnMAK4f3tT/p5HeFO6yRQBE2B3IngSomRxbNh143VswNYqtZYy03UhOm8vbF2OfOJ/
+NzwC/F+19XgntnC0qv5j6VzwMGTt2NYPWXUqSzVIFswSunj70+ZsprCRX5IEFnpHDSL7OwDjEMFc
+z6dpYQ9pwgyKh7JiLZxAr/9Nhb8QQDGrolzHoDt1QnC/DYvDGfTKu0ZjlXR4EQN4XFV+FAiykRfA
+N1jIsTY7fCmLpLuW4paQnR1lPSGLeSvi63DOgN+lfVSJ5YjZm4yIRIS6lpvLVgcqodDqBRmPMP7x
+fJ3osv1Wt4L/77BdJpZrUUygysRpzyUKlC6NwXr338HKPyAnfrkzIpHKnhTUaRVmfgAuzrXMFp8C
+ejyYXJQwPPFAL5mIdUMkLDQKzESI0T3AD1LWVDM/0mGud9GhqiycI6AqC0j7MynRCvQG0LyRunFG
+EQ2KipM//qPFKqwoVukxrLTunmGyeOe6UxodtK+qcn7SIXZ8jJM14a5rSDwAAAADAAVYLjUwOQAA
+AjowggI2MIIBn6ADAgECAgQ/Pta3MA0GCSqGSIb3DQEBBAUAMFIxCzAJBgNVBAYTAlVTMREwDwYD
+VQQKEwhKYXZhU29mdDEVMBMGA1UECxMMU2VjdXJpdHkgU1FFMRkwFwYDVQQDExBQS0NTMTIgVGVz
+dCBMZWFkMB4XDTAwMDgwOTA3MDAwMFoXDTEwMDgwNzA3MDAwMFowWDELMAkGA1UEBhMCVVMxETAP
+BgNVBAoTCEphdmFTb2Z0MRUwEwYDVQQLEwxTZWN1cml0eSBTUUUxHzAdBgNVBAMTFlBLQ1MxMiBU
+ZXN0IEVuZCBVc2VyIDEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMgqiZJiiYPMf9Xrd4NA
+Qbuh3QMtyedVnzWltaEOyzyAdXabykAN1Gp2KEGadJARoxbgPe5niwUTUu2RCWzqGN3tJ06wbljb
+gvzXmOi31rYlwHvcfwfRUqKus5svkFl23sG0BI8Odi1bhKm375iMOgkXHIXQdyGRq/NdpVOV7FqT
+AgMBAAGjEzARMA8GA1UdDwEB/wQFAwMHgAAwDQYJKoZIhvcNAQEEBQADgYEAgUDclcSZv0BefdEP
+u34yfoOjJUMjLmOyfrE4pMlXbkjShukNTODDhBoAyYzRm+6w6ZnbBk1Lwy3JNSB0A3JqRvOflJ3F
+tPJMsSpCwVtfxRULfx/HlkzoTEDlhIC+CZe51mk5ULQBNxyhlLckVTwLFJ9b5DcgLYwuH5BODeFQ
+nlsABVguNTA5AAACxDCCAsAwggGooAMCAQICBD8+0tYwDQYJKoZIhvcNAQEEBQAwUDELMAkGA1UE
+BhMCVVMxETAPBgNVBAoTCEphdmFTb2Z0MRUwEwYDVQQLEwxTZWN1cml0eSBTUUUxFzAVBgNVBAMT
+DlBLQ1MxMiBUZXN0IENBMB4XDTAwMDgwOTA3MDAwMFoXDTEwMDgwNzA3MDAwMFowUjELMAkGA1UE
+BhMCVVMxETAPBgNVBAoTCEphdmFTb2Z0MRUwEwYDVQQLEwxTZWN1cml0eSBTUUUxGTAXBgNVBAMT
+EFBLQ1MxMiBUZXN0IExlYWQwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM6vV9lEs/1ow4U/
+o1MmVqgeYeAN97UtdWKh+amL6o0143FCOoDqZqFzGnwxvUR0ZSHHL6edcS6ewKd1jK7+NdZVgbba
+rWYuXNfwxAtXBDP0pTwpNa9sxW5Cbu0Conl3jHK42RKOi3ARzMEIyKSPrqfXK91Y7sqhv6JUJFJl
+1bktAgMBAAGjJDAiMA8GA1UdDwEB/wQFAwMHgAAwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0B
+AQQFAAOCAQEAYW7opvfE1prb/b0pXURO0b0PBZUtE8mVTu5HEjbXwlBOEe+idRJTe+CqHOaUJ1LX
+bi3kCbNmqP5hHAmbBM1XMCN5kma0sz4XPLO8OYDkAOE1MFS0koyoAQmme0d/qid0HqjyeTurBc6b
+wWJIEmuDFqbSuNY25k/HMGUCVxQovFsRRSfqfexdT6Zty4JmJrYlD+DGUMDgb6U2Vl1NFq6hV6c1
+kMdJoOEl9fX2ZuJy3CQHqwhFKYX/CC2oLaUDBBK09/44OpnwnU90Y9OeUFz3xeDokRXrzxeWtX2Y
+KwnjwrpEUGXHe7PCuTgSGq8rjNDHRbZc8Yul1nlDaVRRR1EXMgAFWC41MDkAAAMbMIIDFzCCAf8C
+BD8+0nAwDQYJKoZIhvcNAQEFBQAwUDELMAkGA1UEBhMCVVMxETAPBgNVBAoTCEphdmFTb2Z0MRUw
+EwYDVQQLEwxTZWN1cml0eSBTUUUxFzAVBgNVBAMTDlBLQ1MxMiBUZXN0IENBMB4XDTAzMDgxNzAw
+NTUxMloXDTEzMDgxNDAwNTUxMlowUDELMAkGA1UEBhMCVVMxETAPBgNVBAoTCEphdmFTb2Z0MRUw
+EwYDVQQLEwxTZWN1cml0eSBTUUUxFzAVBgNVBAMTDlBLQ1MxMiBUZXN0IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk7Sh+K/yGsmJacZnjfkZfuWxGNJCPW0q69exwoRP+eBHMQwG
+00yi9aLSsZAqNpJSCDvpgySOAUmBd+f8WFhHqJfRVREVfv3mradDKZCjhqtsUI7IwRTYYy9clFke
+eK4dHaxbuFMPpUu7yQfwSTXgvOA/UJ4kJuGtaYAdTJI4ef1mUASo6+dea0UZA/FHCuV7O6z3hr5V
+HlyhJL2/o/8M5tGBTBISODJSnnGNBvtQLNHnWYvs470UAE2BtuCGYh1V/3HAH1tRirS3MBBcb1Xn
+IkiiXR3tjaBSB+XhoCfuG8KtInXXFaAnvKfY9mYFw6VJt9JYQpY2VDC7281/Pbz0dQIDAQABMA0G
+CSqGSIb3DQEBBQUAA4IBAQBzXZ8zHWrnC8/E+N/n2Czhxi18YQc2LPWBDLYTTxoFEazWmYLv1k/J
+T7Nta1qu1quvxXJ4uV1XHbd9NFAJWKwtFQEpfv4o6I7qWUPoxnfA+jyqKXxv27z25tzt+Y4xOEhq
+vO03G0QimhkiNt9MF7L69y2U0/U73+uFNGzdAEDiI9EibvICiOnr1TeQ5GekK3Ybk5qe3lviMZPk
+kSXepTJI8m0AiXCji+eXj97jVLeH+RxeBchBY+uELrqUrsVOVWh7IBCqC/V7FqUTkmD1IFlzkkin
+atpl42s1MbhJId2yQkzaeBRcsuE63bDEtuRWp9ynMO3QA4Yu85uBRWGzQ1Di7p2dz0wNRNimbVP4
+VL+NWQOgtME=
\ No newline at end of file
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/util/Arrays/TimSortStackSize2.java
--- a/jdk/test/java/util/Arrays/TimSortStackSize2.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/java/util/Arrays/TimSortStackSize2.java Mon Apr 06 10:35:43 2015 -0700
@@ -24,22 +24,63 @@
/*
* @test
* @bug 8072909
- * @run main/othervm -Xms385m TimSortStackSize2 67108864
+ * @library /lib/testlibrary /../../test/lib
+ * @build jdk.testlibrary.*
+ * @build TimSortStackSize2
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * -XX:+WhiteBoxAPI TimSortStackSize2
* @summary Test TimSort stack size on big arrays
- * big tests not for regular execution on all platforms:
- * run main/othervm -Xmx8g TimSortStackSize2 1073741824
- * run main/othervm -Xmx16g TimSortStackSize2 2147483644
*/
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Comparator;
import java.util.List;
import java.util.function.Consumer;
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.Utils;
+import sun.hotspot.WhiteBox;
+
public class TimSortStackSize2 {
public static void main(String[] args) {
- int lengthOfTest = Integer.parseInt(args[0]);
+ if ( args == null || args.length == 0 ){
+ startMeWithArgs();
+ } else {
+ doTestOfTwoTimSorts(Integer.parseInt(args[0]));
+ }
+ }
+
+ private static void startMeWithArgs(){
+ /*
+ * big tests not for regular execution on all platforms:
+ * run main/othervm -Xmx8g TimSortStackSize2 1073741824
+ * run main/othervm -Xmx16g TimSortStackSize2 2147483644
+ */
+ try {
+ Boolean compressedOops = WhiteBox.getWhiteBox()
+ .getBooleanVMFlag("UseCompressedOops");
+ final String xmsValue = "-Xms" +
+ ((compressedOops == null || compressedOops) ? "385" : "770")
+ + "m";
+ System.out.println( "compressedOops: " + compressedOops
+ + "; Test will be started with \"" + xmsValue + "\"");
+ ProcessBuilder processBuilder = ProcessTools
+ .createJavaProcessBuilder(Utils.addTestJavaOpts(xmsValue,
+ "TimSortStackSize2", "67108864"
+ )
+ );
+ OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);
+ System.out.println(output.getOutput());
+ output.shouldHaveExitValue(0);
+ } catch( Exception e ){
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static void doTestOfTwoTimSorts(final int lengthOfTest){
boolean passed = doTest("TimSort", lengthOfTest,
(Integer [] a) -> Arrays.sort(a));
passed = doTest("ComparableTimSort", lengthOfTest, (Integer [] a) ->
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/util/Properties/Basic.java
--- a/jdk/test/java/util/Properties/Basic.java Tue Mar 31 16:22:59 2015 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2015, 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.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Properties;
-
-/*
- * @test
- * @bug 8073214
- * @summary Basic tests of Properties methods.
- */
-public class Basic
-{
- public static void main(String[] args) throws Exception
- {
- int failures = 0;
-
- Properties props = new Properties();
-
- try {
- props.store((OutputStream)null, "comments");
- failures++;
- } catch (NullPointerException e) {
- // do nothing
- }
-
- try {
- props.store((Writer)null, "comments");
- failures++;
- } catch (NullPointerException e) {
- // do nothing
- }
-
- try {
- props.load((InputStream)null);
- failures++;
- } catch (NullPointerException e) {
- // do nothing
- }
-
- try {
- props.load((Reader)null);
- failures++;
- } catch (NullPointerException e) {
- // do nothing
- }
-
- if (failures != 0) {
- throw new RuntimeException("Basic failed with "
- + failures + " errors!");
- }
- }
-}
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/util/Properties/LoadAndStoreNPE.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/Properties/LoadAndStoreNPE.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2015, 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.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.Properties;
+
+/*
+ * @test
+ * @bug 8073214 8075362
+ * @summary Tests to verify that load() and store() throw NPEs as advertised.
+ */
+public class LoadAndStoreNPE
+{
+ public static void main(String[] args) throws Exception
+ {
+ int failures = 0;
+
+ Properties props = new Properties();
+
+ try {
+ props.store((OutputStream)null, "comments");
+ failures++;
+ } catch (NullPointerException e) {
+ // do nothing
+ }
+
+ try {
+ props.store((Writer)null, "comments");
+ failures++;
+ } catch (NullPointerException e) {
+ // do nothing
+ }
+
+ try {
+ props.load((InputStream)null);
+ failures++;
+ } catch (NullPointerException e) {
+ // do nothing
+ }
+
+ try {
+ props.load((Reader)null);
+ failures++;
+ } catch (NullPointerException e) {
+ // do nothing
+ }
+
+ if (failures != 0) {
+ throw new RuntimeException("LoadAndStoreNPE failed with "
+ + failures + " errors!");
+ }
+ }
+}
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/util/stream/boottest/java/util/stream/UnorderedTest.java
--- a/jdk/test/java/util/stream/boottest/java/util/stream/UnorderedTest.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/java/util/stream/boottest/java/util/stream/UnorderedTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -251,7 +251,7 @@
final int lastLimitIndex = l;
return s -> {
- if (lastLimitIndex == -1)
+ if (lastLimitIndex == -1 && fs.size() > 0)
s = fi.apply(s);
for (int i = 0; i < fs.size(); i++) {
s = fs.get(i).apply(s);
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/CountTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -24,11 +24,12 @@
/**
* @test
* @summary Tests counting of streams
- * @bug 8031187 8067969
+ * @bug 8031187 8067969 8075307
*/
package org.openjdk.tests.java.util.stream;
+import java.util.HashSet;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.DoubleStream;
import java.util.stream.DoubleStreamTestDataProvider;
@@ -59,6 +60,19 @@
terminal(s -> s.filter(e -> true), Stream::count).
expectedResult(expectedCount).
exercise();
+
+ // Test with stateful distinct op that is a barrier or lazy
+ // depending if source is not already distinct and encounter order is
+ // preserved or not
+ expectedCount = data.into(new HashSet<>()).size();
+ withData(data).
+ terminal(Stream::distinct, Stream::count).
+ expectedResult(expectedCount).
+ exercise();
+ withData(data).
+ terminal(s -> s.unordered().distinct(), Stream::count).
+ expectedResult(expectedCount).
+ exercise();
}
@Test(dataProvider = "IntStreamTestData", dataProviderClass = IntStreamTestDataProvider.class)
@@ -74,6 +88,16 @@
terminal(s -> s.filter(e -> true), IntStream::count).
expectedResult(expectedCount).
exercise();
+
+ expectedCount = data.into(new HashSet<>()).size();
+ withData(data).
+ terminal(IntStream::distinct, IntStream::count).
+ expectedResult(expectedCount).
+ exercise();
+ withData(data).
+ terminal(s -> s.unordered().distinct(), IntStream::count).
+ expectedResult(expectedCount).
+ exercise();
}
@Test(dataProvider = "LongStreamTestData", dataProviderClass = LongStreamTestDataProvider.class)
@@ -89,6 +113,16 @@
terminal(s -> s.filter(e -> true), LongStream::count).
expectedResult(expectedCount).
exercise();
+
+ expectedCount = data.into(new HashSet<>()).size();
+ withData(data).
+ terminal(LongStream::distinct, LongStream::count).
+ expectedResult(expectedCount).
+ exercise();
+ withData(data).
+ terminal(s -> s.unordered().distinct(), LongStream::count).
+ expectedResult(expectedCount).
+ exercise();
}
@Test(dataProvider = "DoubleStreamTestData", dataProviderClass = DoubleStreamTestDataProvider.class)
@@ -104,6 +138,16 @@
terminal(s -> s.filter(e -> true), DoubleStream::count).
expectedResult(expectedCount).
exercise();
+
+ expectedCount = data.into(new HashSet<>()).size();
+ withData(data).
+ terminal(DoubleStream::distinct, DoubleStream::count).
+ expectedResult(expectedCount).
+ exercise();
+ withData(data).
+ terminal(s -> s.unordered().distinct(), DoubleStream::count).
+ expectedResult(expectedCount).
+ exercise();
}
public void testNoEvaluationForSizedStream() {
@@ -111,24 +155,36 @@
AtomicInteger ai = new AtomicInteger();
Stream.of(1, 2, 3, 4).peek(e -> ai.getAndIncrement()).count();
assertEquals(ai.get(), 0);
+
+ Stream.of(1, 2, 3, 4).peek(e -> ai.getAndIncrement()).parallel().count();
+ assertEquals(ai.get(), 0);
}
{
AtomicInteger ai = new AtomicInteger();
IntStream.of(1, 2, 3, 4).peek(e -> ai.getAndIncrement()).count();
assertEquals(ai.get(), 0);
+
+ IntStream.of(1, 2, 3, 4).peek(e -> ai.getAndIncrement()).parallel().count();
+ assertEquals(ai.get(), 0);
}
{
AtomicInteger ai = new AtomicInteger();
LongStream.of(1, 2, 3, 4).peek(e -> ai.getAndIncrement()).count();
assertEquals(ai.get(), 0);
+
+ LongStream.of(1, 2, 3, 4).peek(e -> ai.getAndIncrement()).parallel().count();
+ assertEquals(ai.get(), 0);
}
{
AtomicInteger ai = new AtomicInteger();
DoubleStream.of(1, 2, 3, 4).peek(e -> ai.getAndIncrement()).count();
assertEquals(ai.get(), 0);
+
+ DoubleStream.of(1, 2, 3, 4).peek(e -> ai.getAndIncrement()).parallel().count();
+ assertEquals(ai.get(), 0);
}
}
}
diff -r d47c58140b41 -r 427f83353f73 jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java
--- a/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/java/util/stream/test/org/openjdk/tests/java/util/stream/DistinctOpTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, 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
@@ -128,7 +128,7 @@
@Test(dataProvider = "StreamTestData", dataProviderClass = StreamTestDataProvider.class)
public void testDistinctDistinct(String name, TestData.OfRef data) {
Collection result = withData(data)
- .stream(s -> s.distinct().distinct(), new CollectorOps.TestParallelSizedOp<>())
+ .stream(s -> s.distinct().distinct())
.exercise();
assertUnique(result);
}
diff -r d47c58140b41 -r 427f83353f73 jdk/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java
--- a/jdk/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java Mon Apr 06 10:35:43 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -80,7 +80,7 @@
}
try {
- urlc.getServerCertificateChain();
+ urlc.getServerCertificates();
} catch (IllegalStateException e) {
System.out.print("Caught proper exception: ");
System.out.println(e.getMessage());
diff -r d47c58140b41 -r 427f83353f73 jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java Mon Apr 06 10:35:43 2015 -0700
@@ -24,6 +24,8 @@
package jdk.testlibrary;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.io.PrintStream;
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
@@ -34,6 +36,7 @@
import java.util.Collections;
import java.util.concurrent.CountDownLatch;
import java.util.Map;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -188,8 +191,8 @@
} else {
latch.countDown();
}
- Future stdoutTask = stdout.process();
- Future stderrTask = stderr.process();
+ final Future stdoutTask = stdout.process();
+ final Future stderrTask = stderr.process();
try {
if (timeout > -1) {
@@ -216,7 +219,7 @@
throw e;
}
- return p;
+ return new ProcessImpl(p, stdoutTask, stderrTask);
}
/**
@@ -436,4 +439,84 @@
System.out.println(analyzer.getOutput());
return analyzer;
}
+
+ private static class ProcessImpl extends Process {
+
+ private final Process p;
+ private final Future stdoutTask;
+ private final Future stderrTask;
+
+ public ProcessImpl(Process p, Future stdoutTask, Future stderrTask) {
+ this.p = p;
+ this.stdoutTask = stdoutTask;
+ this.stderrTask = stderrTask;
+ }
+
+ @Override
+ public OutputStream getOutputStream() {
+ return p.getOutputStream();
+ }
+
+ @Override
+ public InputStream getInputStream() {
+ return p.getInputStream();
+ }
+
+ @Override
+ public InputStream getErrorStream() {
+ return p.getErrorStream();
+ }
+
+ @Override
+ public int waitFor() throws InterruptedException {
+ int rslt = p.waitFor();
+ waitForStreams();
+ return rslt;
+ }
+
+ @Override
+ public int exitValue() {
+ return p.exitValue();
+ }
+
+ @Override
+ public void destroy() {
+ p.destroy();
+ }
+
+ @Override
+ public long getPid() {
+ return p.getPid();
+ }
+
+ @Override
+ public boolean isAlive() {
+ return p.isAlive();
+ }
+
+ @Override
+ public Process destroyForcibly() {
+ return p.destroyForcibly();
+ }
+
+ @Override
+ public boolean waitFor(long timeout, TimeUnit unit) throws InterruptedException {
+ boolean rslt = p.waitFor(timeout, unit);
+ if (rslt) {
+ waitForStreams();
+ }
+ return rslt;
+ }
+
+ private void waitForStreams() throws InterruptedException {
+ try {
+ stdoutTask.get();
+ } catch (ExecutionException e) {
+ }
+ try {
+ stderrTask.get();
+ } catch (ExecutionException e) {
+ }
+ }
+ }
}
diff -r d47c58140b41 -r 427f83353f73 jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java
--- a/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -90,7 +90,6 @@
}
}
}
- System.err.println("*** port = " + port);
ports[i] = port;
}
return ports;
diff -r d47c58140b41 -r 427f83353f73 jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java
--- a/jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java Mon Apr 06 10:35:43 2015 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -34,8 +34,8 @@
import java.io.*;
import java.net.*;
+import java.security.cert.Certificate;
import javax.net.ssl.*;
-import javax.security.cert.*;
import com.sun.net.ssl.HostnameVerifier;
import com.sun.net.ssl.HttpsURLConnection;
@@ -240,8 +240,8 @@
System.out.println("Cipher Suite: " +
((HttpsURLConnection)urlc).getCipherSuite());
- X509Certificate[] certs =
- ((HttpsURLConnection)urlc).getServerCertificateChain();
+ Certificate[] certs =
+ ((HttpsURLConnection)urlc).getServerCertificates();
for (int i = 0; i < certs.length; i++) {
System.out.println(certs[0]);
}
diff -r d47c58140b41 -r 427f83353f73 jdk/test/sun/security/mscapi/ShortRSAKey1024.sh
--- a/jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/sun/security/mscapi/ShortRSAKey1024.sh Mon Apr 06 10:35:43 2015 -0700
@@ -30,6 +30,7 @@
# @run shell ShortRSAKey1024.sh 1024
# @run shell ShortRSAKey1024.sh 768
# @run shell ShortRSAKey1024.sh 512
+# @key intermittent
# set a few environment variables so that the shell-script can run stand-alone
# in the source directory
diff -r d47c58140b41 -r 427f83353f73 jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.sh
--- a/jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.sh Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/sun/security/mscapi/SignUsingNONEwithRSA.sh Mon Apr 06 10:35:43 2015 -0700
@@ -28,6 +28,7 @@
# @bug 6578658
# @run shell SignUsingNONEwithRSA.sh
# @summary Sign using the NONEwithRSA signature algorithm from SunMSCAPI
+# @key intermittent
# set a few environment variables so that the shell-script can run stand-alone
# in the source directory
diff -r d47c58140b41 -r 427f83353f73 jdk/test/sun/security/provider/X509Factory/BadPem.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/security/provider/X509Factory/BadPem.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2015, 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 8074935
+ * @summary jdk8 keytool doesn't validate pem files for RFC 1421 correctness, as jdk7 did
+ */
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+import java.security.KeyStore;
+import java.security.cert.CertificateException;
+import java.util.Arrays;
+import java.util.Base64;
+
+import sun.security.provider.X509Factory;
+import java.security.cert.CertificateFactory;
+import java.io.ByteArrayInputStream;
+
+public class BadPem {
+
+ public static void main(String[] args) throws Exception {
+ String ks = System.getProperty("test.src", ".")
+ + "/../../../../javax/net/ssl/etc/keystore";
+ String pass = "passphrase";
+ String alias = "dummy";
+
+ KeyStore keyStore = KeyStore.getInstance("JKS");
+ keyStore.load(new FileInputStream(ks), pass.toCharArray());
+ byte[] cert = keyStore.getCertificate(alias).getEncoded();
+
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ PrintStream pout = new PrintStream(bout);
+ byte[] CRLF = new byte[] {'\r', '\n'};
+ pout.println(X509Factory.BEGIN_CERT);
+ for (int i=0; i i + 48) ? 48 : (cert.length - i);
+ pout.println("!" + Base64.getEncoder()
+ .encodeToString(Arrays.copyOfRange(cert, i, i + blockLen)));
+ }
+ pout.println(X509Factory.END_CERT);
+
+ CertificateFactory cf = CertificateFactory.getInstance("X.509");
+
+ try {
+ cf.generateCertificate(new ByteArrayInputStream(bout.toByteArray()));
+ throw new Exception("Should fail");
+ } catch (CertificateException e) {
+ // Good
+ }
+ }
+}
+
diff -r d47c58140b41 -r 427f83353f73 jdk/test/sun/security/tools/keytool/KeyToolTest.java
--- a/jdk/test/sun/security/tools/keytool/KeyToolTest.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/sun/security/tools/keytool/KeyToolTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -56,6 +56,8 @@
* NSS PKCS11 config file are changed, DSA not supported now.
*/
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.security.KeyStore;
import sun.security.x509.*;
import java.io.*;
@@ -1222,6 +1224,24 @@
remove("mykey.cert");
}
+ // 8074935: jdk8 keytool doesn't validate pem files for RFC 1421 correctness
+ static void checkPem(String file) throws Exception {
+ boolean maybeLast = false;
+ for (String s: Files.readAllLines(Paths.get(file))) {
+ if (s.isEmpty()) continue;
+ if (s.startsWith("---")) continue;
+ if (maybeLast) {
+ throw new Exception("Last line already seen");
+ }
+ if (s.length() > 64) {
+ throw new Exception(s);
+ }
+ if (s.length() < 64) {
+ maybeLast = true;
+ }
+ }
+ }
+
void v3extTest(String keyAlg) throws Exception {
KeyStore ks;
remove("x.jks");
@@ -1588,12 +1608,14 @@
"-rfc -file test.req");
// printcertreq
testOK("", "-printcertreq -file test.req");
+ checkPem("test.req");
// issue: deny KU, change criticality of 1.2.3 and 1.2.4,
// change content of BC, add 2.3.4
testOK("", simple+"-gencert -alias ca -infile test.req -ext " +
"honored=all,-KU,1.2.3:critical,1.2.4:non-critical " +
"-ext BC=2 -ext 2.3.4=01020304 " +
"-debug -rfc -outfile test.cert");
+ checkPem("test.cert");
testOK("", simple+"-importcert -file test.cert -alias a");
ks = loadStore("x.jks", "changeit", "JKS");
X509CertImpl a = (X509CertImpl)ks.getCertificate("a");
diff -r d47c58140b41 -r 427f83353f73 jdk/test/sun/text/resources/LocaleData
--- a/jdk/test/sun/text/resources/LocaleData Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/sun/text/resources/LocaleData Mon Apr 06 10:35:43 2015 -0700
@@ -8279,3 +8279,6 @@
FormatData/fi/DatePatterns/1=d. MMMM yyyy
FormatData/fi/DatePatterns/2=d.M.yyyy
FormatData/fi/DatePatterns/3=d.M.yyyy
+
+# bug #8075173
+FormatData/de/standalone.MonthAbbreviations/2=M\u00e4r
diff -r d47c58140b41 -r 427f83353f73 jdk/test/sun/text/resources/LocaleDataTest.java
--- a/jdk/test/sun/text/resources/LocaleDataTest.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -36,7 +36,7 @@
* 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
* 7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
* 7114053 7074882 7040556 8013836 8021121 6192407 6931564 8027695 8017142
- * 8037343 8055222 8042126 8074791
+ * 8037343 8055222 8042126 8074791 8075173
* @summary Verify locale data
*
*/
diff -r d47c58140b41 -r 427f83353f73 jdk/test/sun/tools/jmap/heapconfig/LingeredApp.java
--- a/jdk/test/sun/tools/jmap/heapconfig/LingeredApp.java Tue Mar 31 16:22:59 2015 -0700
+++ b/jdk/test/sun/tools/jmap/heapconfig/LingeredApp.java Mon Apr 06 10:35:43 2015 -0700
@@ -417,7 +417,9 @@
setLastModified(theLockFileName, epoch());
Thread.sleep(spinDelay);
}
-
+ } catch (NoSuchFileException ex) {
+ // Lock deleted while we are setting last modified time.
+ // Ignore error and lets the app exits
} catch (Exception ex) {
System.err.println("LingeredApp ERROR: " + ex);
// Leave exit_code = 1 to Java launcher
diff -r d47c58140b41 -r 427f83353f73 langtools/.hgtags
--- a/langtools/.hgtags Tue Mar 31 16:22:59 2015 -0700
+++ b/langtools/.hgtags Mon Apr 06 10:35:43 2015 -0700
@@ -298,3 +298,5 @@
99ff00581f3633c1787bec21f2a8f3a2ffe57665 jdk9-b53
ed34864f3b43a7df394fce6c3f0bc86b70a5d686 jdk9-b54
32a2e724988499e6f68611a65168c5f2fde0f6b9 jdk9-b55
+5ee7bba6ef41447f921184e8522da36734aec089 jdk9-b56
+ec977a00cecbf0007b0fa26c7af2852d57a79cad jdk9-b57
diff -r d47c58140b41 -r 427f83353f73 langtools/test/tools/javac/classfiles/attributes/Signature/ConstructorTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/ConstructorTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2015, 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 8049238
+ * @summary Checks Signature attribute for constructors.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build TestBase TestResult InMemoryFileManager ToolBox
+ * @build ConstructorTest Driver ExpectedSignature ExpectedSignatureContainer
+ * @run main Driver ConstructorTest
+ */
+
+import java.lang.ref.ReferenceQueue;
+import java.util.*;
+
+@ExpectedSignature(descriptor = "ConstructorTest", signature = "Ljava/lang/Object;")
+public class ConstructorTest {
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, boolean)", signature = "(TT;Z)V")
+ ConstructorTest(T a, boolean b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, byte)", signature = "(TT;B)V")
+ ConstructorTest(T a, byte b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, char)", signature = "(TT;C)V")
+ ConstructorTest(T a, char b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, short)", signature = "(TT;S)V")
+ ConstructorTest(T a, short b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, int)", signature = "(TT;I)V")
+ ConstructorTest(T a, int b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, long)", signature = "(TT;J)V")
+ ConstructorTest(T a, long b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, float)", signature = "(TT;F)V")
+ ConstructorTest(T a, float b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, double)", signature = "(TT;D)V")
+ ConstructorTest(T a, double b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, java.lang.Runnable)", signature = "(TT;Ljava/lang/Runnable;)V")
+ ConstructorTest(T a, Runnable r) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, boolean[])", signature = "(TT;[Z)V")
+ ConstructorTest(T a, boolean[] b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, byte[])", signature = "(TT;[B)V")
+ ConstructorTest(T a, byte[] b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, char[])", signature = "(TT;[C)V")
+ ConstructorTest(T a, char[] b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, short[])", signature = "(TT;[S)V")
+ ConstructorTest(T a, short[] b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, int[])", signature = "(TT;[I)V")
+ ConstructorTest(T a, int[] b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, long[])", signature = "(TT;[J)V")
+ ConstructorTest(T a, long[] b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, float[])", signature = "(TT;[F)V")
+ ConstructorTest(T a, float[] b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, double[])", signature = "(TT;[D)V")
+ ConstructorTest(T a, double[] b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, java.lang.Runnable[])", signature = "(TT;[Ljava/lang/Runnable;)V")
+ ConstructorTest(T a, Runnable[] r) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object[])", signature = "([TT;)V")
+ ConstructorTest(T[] a) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Runnable[])",
+ signature = "([TT;)V")
+ ConstructorTest(T...a) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.util.Map)", signature = "(Ljava/util/Map<**>;)V")
+ ConstructorTest(Map a) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object)", signature = "(TT;)V")
+ ConstructorTest(T a) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.util.Set, java.util.Set)",
+ signature = ";>(TE;TE;)V")
+ > ConstructorTest(E a, E b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.ref.ReferenceQueue, java.lang.ref.ReferenceQueue)",
+ signature = ";:Ljava/util/Map<-TT;+TT;>;>(TE;TE;)V")
+ & Map> ConstructorTest(E a, E b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.util.List)", signature = "(Ljava/util/List<+TT;>;)V")
+ ConstructorTest(List b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.util.Set)", signature = "(Ljava/util/Set<-TT;>;)V")
+ ConstructorTest(Set b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Runnable)", signature = "(TE;)V")
+ ConstructorTest(E a) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, java.lang.Object)", signature = "(TT;TE;)V")
+ ConstructorTest(T a, E b) {
+ }
+
+ // no Signature attribute
+ ConstructorTest(boolean b) {
+ }
+
+ // no Signature attribute
+ ConstructorTest(HashMap a) {
+ }
+
+ // no Signature attribute
+ ConstructorTest(boolean[] b) {
+ }
+
+ // no Signature attribute
+ ConstructorTest(HashMap[] a) {
+ }
+}
diff -r d47c58140b41 -r 427f83353f73 langtools/test/tools/javac/classfiles/attributes/Signature/Driver.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/Driver.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2015, 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 com.sun.tools.classfile.*;
+import com.sun.tools.classfile.Field;
+import com.sun.tools.classfile.Method;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * The main class of Signature tests.
+ * Driver reads golden data of each class member that must have a Signature attribute,
+ * after that the class compares expected data with actual one.
+ *
+ * Example of usage Driver:
+ * java Driver Test
+ *
+ * Each member of the class Test should have @ExpectedSignature annotations
+ * if it must have the Signature attribute. Anonymous class cannot be annotated.
+ * So its enclosing class should be annotated and method isAnonymous
+ * of ExpectedSignature must return true.
+ */
+public class Driver extends TestResult {
+
+ private final static String ACC_BRIDGE = "ACC_BRIDGE";
+
+ private final String topLevelClassName;
+ private final File[] files;
+
+ public Driver(String topLevelClassName) {
+ this.topLevelClassName = topLevelClassName;
+ // Get top level class and all inner classes.
+ FilenameFilter filter = (dir, file) ->
+ file.equals(topLevelClassName + ".class")
+ || file.matches(topLevelClassName + "\\$.*\\.class");
+ files = getClassDir().listFiles(filter);
+ }
+
+ private boolean isAnonymous(String className) {
+ return className.matches(".*\\$\\d+$");
+ }
+
+ private Class getEnclosingClass(String className) throws ClassNotFoundException {
+ return Class.forName(className.replaceFirst("\\$\\d+$", ""));
+ }
+
+ private ExpectedSignature getExpectedClassSignature(String className, Class clazz)
+ throws ClassNotFoundException {
+ // anonymous class cannot be annotated, so information about anonymous class
+ // is located in its enclosing class.
+ boolean isAnonymous = isAnonymous(className);
+ clazz = isAnonymous ? getEnclosingClass(className) : clazz;
+ return Stream.of(clazz.getAnnotationsByType(ExpectedSignature.class))
+ .filter(s -> s.isAnonymous() == isAnonymous)
+ .collect(Collectors.toMap(ExpectedSignature::descriptor, Function.identity()))
+ .get(className);
+ }
+
+ // Class.getName() cannot be used here, because the method can rely on signature attribute.
+ private Map getClassExpectedSignature(String className, Class clazz)
+ throws ClassNotFoundException {
+ Map classSignatures = new HashMap<>();
+ ExpectedSignature classSignature = getExpectedClassSignature(className, clazz);
+ if (classSignature != null) {
+ classSignatures.put(className, classSignature);
+ }
+ return classSignatures;
+ }
+
+ private Map getExpectedExecutableSignatures(Executable[] executables,
+ Predicate filterBridge) {
+ return Stream.of(executables)
+ .filter(filterBridge)
+ .map(e -> e.getAnnotation(ExpectedSignature.class))
+ .filter(Objects::nonNull)
+ .collect(Collectors.toMap(ExpectedSignature::descriptor, Function.identity()));
+ }
+
+ private Map getExpectedMethodSignatures(Class clazz) {
+ Map methodSignatures =
+ getExpectedExecutableSignatures(clazz.getDeclaredMethods(),
+ m -> !((java.lang.reflect.Method) m).isBridge());
+ methodSignatures.putAll(
+ getExpectedExecutableSignatures(clazz.getDeclaredConstructors(),
+ m -> true));
+ return methodSignatures;
+ }
+
+ private Map getExpectedFieldSignatures(Class clazz) {
+ return Stream.of(clazz.getDeclaredFields())
+ .map(f -> f.getAnnotation(ExpectedSignature.class))
+ .filter(Objects::nonNull)
+ .collect(Collectors.toMap(ExpectedSignature::descriptor, Function.identity()));
+ }
+
+ public void test() throws TestFailedException {
+ try {
+ addTestCase("Source is " + topLevelClassName + ".java");
+ assertTrue(files.length > 0, "No class files found");
+ for (File file : files) {
+ try {
+ String className = file.getName().replace(".class", "");
+ Class clazz = Class.forName(className);
+ printf("Testing class %s\n", className);
+ ClassFile classFile = readClassFile(file);
+
+ // test class signature
+ testAttribute(
+ className,
+ classFile,
+ () -> (Signature_attribute) classFile.getAttribute(Attribute.Signature),
+ getClassExpectedSignature(className, clazz).get(className));
+
+ testFields(getExpectedFieldSignatures(clazz), classFile);
+
+ testMethods(getExpectedMethodSignatures(clazz), classFile);
+ } catch (Exception e) {
+ addFailure(e);
+ }
+ }
+ } catch (Exception e) {
+ addFailure(e);
+ } finally {
+ checkStatus();
+ }
+ }
+
+ private void checkAllMembersFound(Set found, Map signatures, String message) {
+ if (signatures != null) {
+ checkContains(found,
+ signatures.values().stream()
+ .map(ExpectedSignature::descriptor)
+ .collect(Collectors.toSet()),
+ message);
+ }
+ }
+
+ private void testMethods(Map expectedSignatures, ClassFile classFile)
+ throws ConstantPoolException, Descriptor.InvalidDescriptor {
+ String className = classFile.getName();
+ Set foundMethods = new HashSet<>();
+ for (Method method : classFile.methods) {
+ String methodName = getMethodName(classFile, method);
+ printf("Testing method %s\n", methodName);
+ if (method.access_flags.getMethodFlags().contains(ACC_BRIDGE)) {
+ printf("Bridge method is skipped : %s\n", methodName);
+ continue;
+ }
+ testAttribute(
+ methodName,
+ classFile,
+ () -> (Signature_attribute) method.attributes.get(Attribute.Signature),
+ expectedSignatures.get(methodName));
+ foundMethods.add(methodName);
+ }
+ checkAllMembersFound(foundMethods, expectedSignatures,
+ "Checking that all methods of class " + className + " with Signature attribute found");
+ }
+
+ private String getMethodName(ClassFile classFile, Method method)
+ throws ConstantPoolException, Descriptor.InvalidDescriptor {
+ return String.format("%s%s",
+ method.getName(classFile.constant_pool),
+ method.descriptor.getParameterTypes(classFile.constant_pool));
+ }
+
+ private void testFields(Map expectedSignatures, ClassFile classFile)
+ throws ConstantPoolException {
+ String className = classFile.getName();
+ Set foundFields = new HashSet<>();
+ for (Field field : classFile.fields) {
+ String fieldName = field.getName(classFile.constant_pool);
+ printf("Testing field %s\n", fieldName);
+ testAttribute(
+ fieldName,
+ classFile,
+ () -> (Signature_attribute) field.attributes.get(Attribute.Signature),
+ expectedSignatures.get(fieldName));
+ foundFields.add(fieldName);
+ }
+ checkAllMembersFound(foundFields, expectedSignatures,
+ "Checking that all fields of class " + className + " with Signature attribute found");
+ }
+
+ private void testAttribute(
+ String memberName,
+ ClassFile classFile,
+ Supplier sup,
+ ExpectedSignature expectedSignature)
+ throws ConstantPoolException {
+
+ Signature_attribute attribute = sup.get();
+ if (expectedSignature != null && checkNotNull(attribute, memberName + " must have attribute")) {
+ checkEquals(classFile.constant_pool.getUTF8Value(attribute.attribute_name_index),
+ "Signature", "Attribute's name : " + memberName);
+ checkEquals(attribute.attribute_length, 2, "Attribute's length : " + memberName);
+ checkEquals(attribute.getSignature(classFile.constant_pool),
+ expectedSignature.signature(),
+ "Testing signature of : " + memberName);
+ } else {
+ checkNull(attribute, memberName + " must not have attribute");
+ }
+ }
+
+ public static void main(String[] args) throws TestFailedException {
+ if (args.length != 1) {
+ throw new IllegalArgumentException("Usage: Driver ");
+ }
+ new Driver(args[0]).test();
+ }
+}
\ No newline at end of file
diff -r d47c58140b41 -r 427f83353f73 langtools/test/tools/javac/classfiles/attributes/Signature/EnumTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/EnumTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2015, 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 8049238
+ * @summary Checks Signature attribute for enum.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build TestBase TestResult InMemoryFileManager ToolBox
+ * @build EnumTest Driver ExpectedSignature ExpectedSignatureContainer
+ * @run main Driver EnumTest
+ */
+
+@ExpectedSignature(descriptor = "EnumTest", signature = "Ljava/lang/Enum;")
+public enum EnumTest {;
+ // see 8026480
+ @ExpectedSignature(descriptor = "(java.lang.String, int)", signature = "()V")
+ private EnumTest() {}
+}
\ No newline at end of file
diff -r d47c58140b41 -r 427f83353f73 langtools/test/tools/javac/classfiles/attributes/Signature/ExceptionTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/ExceptionTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2015, 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 8049238
+ * @summary Checks Signature attribute for methods which throw exceptions.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build TestBase TestResult InMemoryFileManager ToolBox
+ * @build ExceptionTest Driver ExpectedSignature ExpectedSignatureContainer
+ * @run main Driver ExceptionTest
+ */
+
+import java.io.IOError;
+import java.io.IOException;
+
+@ExpectedSignature(descriptor = "ExceptionTest",
+ signature = "Ljava/lang/Object;")
+public class ExceptionTest {
+
+ @ExpectedSignature(descriptor = "()", signature = "()V^TE;")
+ ExceptionTest() throws E {
+ }
+
+ @ExpectedSignature(descriptor = "(int)",
+ signature = "(I)V^Ljava/io/IOException;^TE;^Ljava/io/IOError;")
+ ExceptionTest(int a) throws IOException, E, IOError {
+ }
+
+ @ExpectedSignature(descriptor = "(long)", signature = "(J)V^TExc;")
+ ExceptionTest(long a) throws Exc {
+ }
+
+ @ExpectedSignature(descriptor = "(byte)", signature = "(B)V^Ljava/io/IOError;^TExc;^Ljava/io/IOException;")
+ ExceptionTest(byte a) throws IOError, Exc, IOException {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.RuntimeException)", signature = "(TExc;)V")
+ ExceptionTest(Exc a) throws IOException {
+ }
+
+ // no Signature attribute
+ ExceptionTest(String a) throws IOError {
+ }
+
+ void noSignatureAttributeMethod() throws IOException {
+ }
+
+ @ExpectedSignature(descriptor = "genericMethod(int)", signature = "(I)V^TExc;")
+ void genericMethod(int a) throws Exc {
+ }
+
+ @ExpectedSignature(descriptor = "genericMethod(long)", signature = "(J)V^TExc;^Ljava/io/IOException;")
+ void genericMethod(long a) throws Exc, IOException {
+ }
+
+ @ExpectedSignature(descriptor = "genericMethod(java.lang.RuntimeException)", signature = "(TExc;)V")
+ void genericMethod(Exc a) throws IOError {
+ }
+
+ static void staticNoSignatureAttributeMethod() throws IOException {
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericMethod(int)",
+ signature = "(I)V^TE;")
+ static void staticGenericMethod(int a) throws E {
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericMethod(long)",
+ signature = "(J)V^Ljava/io/IOError;^TE;^Ljava/io/IOException;")
+ static void staticGenericMethod(long a) throws IOError, E, IOException {
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericMethod(java.lang.Exception)",
+ signature = "(TE;)V")
+ static void staticGenericMethod(E a) throws IOError {
+ }
+}
diff -r d47c58140b41 -r 427f83353f73 langtools/test/tools/javac/classfiles/attributes/Signature/ExpectedSignature.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/ExpectedSignature.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2015, 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.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Repeatable(ExpectedSignatureContainer.class)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExpectedSignature {
+ boolean isAnonymous() default false;
+ String descriptor();
+ String signature();
+}
\ No newline at end of file
diff -r d47c58140b41 -r 427f83353f73 langtools/test/tools/javac/classfiles/attributes/Signature/ExpectedSignatureContainer.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/ExpectedSignatureContainer.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2015, 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.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExpectedSignatureContainer {
+ ExpectedSignature[] value();
+}
\ No newline at end of file
diff -r d47c58140b41 -r 427f83353f73 langtools/test/tools/javac/classfiles/attributes/Signature/FieldTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/FieldTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2015, 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 8049238
+ * @summary Checks Signature attribute for fields.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build TestBase TestResult InMemoryFileManager ToolBox
+ * @build FieldTest Driver ExpectedSignature ExpectedSignatureContainer
+ * @run main Driver FieldTest
+ */
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+@ExpectedSignature(descriptor = "FieldTest", signature = "Ljava/lang/Object;")
+public class FieldTest {
+
+ @ExpectedSignature(descriptor = "typeInList", signature = "Ljava/util/List;")
+ List typeInList;
+
+ @ExpectedSignature(descriptor = "boundsType", signature = "Ljava/util/List;>;")
+ List> boundsType;
+
+ @ExpectedSignature(descriptor = "type", signature = "TT;")
+ T type;
+
+ @ExpectedSignature(descriptor = "typeInArray", signature = "[TT;")
+ T[] typeInArray;
+
+ @ExpectedSignature(descriptor = "byteArrayInList", signature = "Ljava/util/List<[B>;")
+ List byteArrayInList;
+
+ @ExpectedSignature(descriptor = "shortArrayInList", signature = "Ljava/util/List<[S>;")
+ List shortArrayInList;
+
+ @ExpectedSignature(descriptor = "intArrayInList", signature = "Ljava/util/List<[I>;")
+ List intArrayInList;
+
+ @ExpectedSignature(descriptor = "longArrayInList", signature = "Ljava/util/List<[J>;")
+ List longArrayInList;
+
+ @ExpectedSignature(descriptor = "charArrayInList", signature = "Ljava/util/List<[C>;")
+ List charArrayInList;
+
+ @ExpectedSignature(descriptor = "booleanArrayInList", signature = "Ljava/util/List<[Z>;")
+ List booleanArrayInList;
+
+ @ExpectedSignature(descriptor = "floatArrayInList", signature = "Ljava/util/List<[F>;")
+ List floatArrayInList;
+
+ @ExpectedSignature(descriptor = "doubleArrayInList", signature = "Ljava/util/List<[D>;")
+ List doubleArrayInList;
+
+ @ExpectedSignature(descriptor = "integerInList", signature = "Ljava/util/List;")
+ List integerInList;
+
+ @ExpectedSignature(descriptor = "typeInMultiArray", signature = "[[TT;")
+ T[][] typeInMultiArray;
+
+ @ExpectedSignature(descriptor = "arrayOfClasses", signature = "[Ljava/util/List;")
+ List[] arrayOfClasses;
+
+ @ExpectedSignature(descriptor = "extendsWildCard", signature = "Ljava/util/List<+TT;>;")
+ List extendsWildCard;
+
+ @ExpectedSignature(descriptor = "superWildCard", signature = "Ljava/util/Comparator<-TT;>;")
+ Comparator superWildCard;
+
+ @ExpectedSignature(descriptor = "extendsSuperWildCard",
+ signature = "Ljava/util/List<+Ljava/util/Comparator<-TT;>;>;")
+ List> extendsSuperWildCard;
+
+ @ExpectedSignature(descriptor = "wildCard", signature = "Ljava/util/Comparator<*>;")
+ Comparator wildCard;
+
+ @ExpectedSignature(descriptor = "boundsBooleanArray", signature = "Ljava/util/Map<+[Z-[Z>;")
+ Map boundsBooleanArray;
+
+ @ExpectedSignature(descriptor = "boundsByteArray", signature = "Ljava/util/Map<+[B-[B>;")
+ Map boundsByteArray;
+
+ @ExpectedSignature(descriptor = "boundsShortArray", signature = "Ljava/util/Map<+[S-[S>;")
+ Map boundsShortArray;
+
+ @ExpectedSignature(descriptor = "boundsIntArray", signature = "Ljava/util/Map<+[I-[I>;")
+ Map boundsIntArray;
+
+ @ExpectedSignature(descriptor = "boundsLongArray", signature = "Ljava/util/Map<+[J-[J>;")
+ Map boundsLongArray;
+
+ @ExpectedSignature(descriptor = "boundsCharArray", signature = "Ljava/util/Map<+[C-[C>;")
+ Map boundsCharArray;
+
+ @ExpectedSignature(descriptor = "boundsFloatArray", signature = "Ljava/util/Map<+[F-[F>;")
+ Map boundsFloatArray;
+
+ @ExpectedSignature(descriptor = "boundsDoubleArray", signature = "Ljava/util/Map<+[D-[D>;")
+ Map boundsDoubleArray;
+
+ @ExpectedSignature(descriptor = "boundsObjectArray",
+ signature = "Ljava/util/Map<+[Ljava/lang/Object;-[Ljava/lang/Object;>;")
+ Map boundsObjectArray;
+
+ boolean booleanNoSignatureAttribute;
+ byte byteNoSignatureAttribute;
+ char charNoSignatureAttribute;
+ short shortNoSignatureAttribute;
+ int intNoSignatureAttribute;
+ long longNoSignatureAttribute;
+ float floatNoSignatureAttribute;
+ double doubleNoSignatureAttribute;
+
+ List listNoSignatureAttribute;
+
+ @ExpectedSignature(descriptor = "staticByteArrayInList", signature = "Ljava/util/List<[B>;")
+ static List staticByteArrayInList;
+
+ @ExpectedSignature(descriptor = "staticShortArrayInList", signature = "Ljava/util/List<[S>;")
+ static List staticShortArrayInList;
+
+ @ExpectedSignature(descriptor = "staticIntArrayInList", signature = "Ljava/util/List<[I>;")
+ static List staticIntArrayInList;
+
+ @ExpectedSignature(descriptor = "staticLongArrayInList", signature = "Ljava/util/List<[J>;")
+ static List staticLongArrayInList;
+
+ @ExpectedSignature(descriptor = "staticCharArrayInList", signature = "Ljava/util/List<[C>;")
+ static List staticCharArrayInList;
+
+ @ExpectedSignature(descriptor = "staticBooleanArrayInList", signature = "Ljava/util/List<[Z>;")
+ static List staticBooleanArrayInList;
+
+ @ExpectedSignature(descriptor = "staticFloatArrayInList", signature = "Ljava/util/List<[F>;")
+ static List staticFloatArrayInList;
+
+ @ExpectedSignature(descriptor = "staticDoubleArrayInList", signature = "Ljava/util/List<[D>;")
+ static List staticDoubleArrayInList;
+
+ @ExpectedSignature(descriptor = "staticIntegerInList", signature = "Ljava/util/List;")
+ static List staticIntegerInList;
+
+ @ExpectedSignature(descriptor = "staticWildCard", signature = "Ljava/util/Comparator<*>;")
+ static Comparator staticWildCard;
+
+ @ExpectedSignature(descriptor = "staticBoundsBooleanArray", signature = "Ljava/util/Map<+[Z-[Z>;")
+ static Map staticBoundsBooleanArray;
+
+ @ExpectedSignature(descriptor = "staticBoundsByteArray", signature = "Ljava/util/Map<+[B-[B>;")
+ static Map staticBoundsByteArray;
+
+ @ExpectedSignature(descriptor = "staticBoundsShortArray", signature = "Ljava/util/Map<+[S-[S>;")
+ static Map staticBoundsShortArray;
+
+ @ExpectedSignature(descriptor = "staticBoundsIntArray", signature = "Ljava/util/Map<+[I-[I>;")
+ static Map staticBoundsIntArray;
+
+ @ExpectedSignature(descriptor = "staticBoundsLongArray", signature = "Ljava/util/Map<+[J-[J>;")
+ static Map staticBoundsLongArray;
+
+ @ExpectedSignature(descriptor = "staticBoundsCharArray", signature = "Ljava/util/Map<+[C-[C>;")
+ static Map staticBoundsCharArray;
+
+ @ExpectedSignature(descriptor = "staticBoundsFloatArray", signature = "Ljava/util/Map<+[F-[F>;")
+ static Map staticBoundsFloatArray;
+
+ @ExpectedSignature(descriptor = "staticBoundsDoubleArray", signature = "Ljava/util/Map<+[D-[D>;")
+ static Map staticBoundsDoubleArray;
+
+ @ExpectedSignature(descriptor = "staticBoundsObjectArray",
+ signature = "Ljava/util/Map<+[Ljava/lang/Object;-[Ljava/lang/Object;>;")
+ static Map staticBoundsObjectArray;
+
+ static boolean staticBooleanNoSignatureAttribute;
+ static byte staticByteNoSignatureAttribute;
+ static char staticCharNoSignatureAttribute;
+ static short staticShortNoSignatureAttribute;
+ static int staticIntNoSignatureAttribute;
+ static long staticLongNoSignatureAttribute;
+ static float staticFloatNoSignatureAttribute;
+ static double staticDoubleNoSignatureAttribute;
+
+ static List staticListNoSignatureAttribute;
+}
diff -r d47c58140b41 -r 427f83353f73 langtools/test/tools/javac/classfiles/attributes/Signature/InnerClassTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/InnerClassTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,362 @@
+/*
+ * Copyright (c) 2015, 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 8049238
+ * @summary Checks Signature attribute for inner classes.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build TestBase TestResult InMemoryFileManager ToolBox
+ * @build InnerClassTest Driver ExpectedSignature ExpectedSignatureContainer
+ * @run main Driver InnerClassTest
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+@ExpectedSignature(descriptor = "InnerClassTest",
+ signature = ";:Ljava/lang/Runnable;>Ljava/lang/Object;")
+@ExpectedSignature(descriptor = "InnerClassTest$1",
+ signature = "LInnerClassTest$1Local1;", isAnonymous = true)
+@ExpectedSignature(descriptor = "InnerClassTest$2",
+ signature = "LInnerClassTest$1Local2;" +
+ "Ljava/util/Map;Ljava/util/ArrayList;>;>;", isAnonymous = true)
+public class InnerClassTest & Runnable> {
+
+ {
+ class Local1 {
+ // no Signature attribute
+ Local1() {
+ }
+
+ @ExpectedSignature(descriptor = "genericType", signature = "TT;")
+ T genericType;
+
+ @ExpectedSignature(descriptor = "genericTypeArray", signature = "[TT;")
+ T[] genericTypeArray;
+ }
+
+ @ExpectedSignature(descriptor = "InnerClassTest$1Local2",
+ signature = ";>Ljava/lang/Object;")
+ class Local2> {
+ // no Signature attribute
+ Local2() {
+ }
+
+ @ExpectedSignature(descriptor = "(InnerClassTest, java.lang.Object, java.util.Map)",
+ signature = "(TT;TU;)V")
+ Local2(T a, U b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericMethod(java.lang.Object[])",
+ signature = "([TT;)[TU;")
+ U[] genericMethod(T...a) {
+ return null;
+ }
+ }
+
+ @ExpectedSignature(descriptor = "InnerClassTest$1Local3",
+ signature = "LInnerClassTest$1Local2;" +
+ "Ljava/util/Map;Ljava/util/ArrayList;>;>;")
+ class Local3 extends Local2, Map, ArrayList>> {
+ }
+
+ new Local1() {
+ @ExpectedSignature(descriptor = "genericType", signature = "TT;")
+ T genericType;
+
+ @ExpectedSignature(descriptor = "genericTypeArray", signature = "[TT;")
+ T[] genericTypeArray;
+ };
+
+ new Local2, Map, ArrayList>>() {
+ };
+ }
+
+ @ExpectedSignature(descriptor = "InnerClassTest$InnerClass1",
+ signature = ";>Ljava/lang/Object;")
+ class InnerClass1> {
+ @ExpectedSignature(descriptor = "genericTypeArray", signature = "[TT;")
+ T[] genericTypeArray;
+
+ @ExpectedSignature(descriptor = "genericListExtendsBound", signature = "Ljava/util/List<+TT;>;")
+ List genericListExtendsBound;
+
+ @ExpectedSignature(descriptor = "genericListSuperBound", signature = "Ljava/util/List<-TU;>;")
+ List genericListSuperBound;
+
+ @ExpectedSignature(descriptor = "genericListWildCard", signature = "Ljava/util/List<*>;")
+ List genericListWildCard;
+
+ @ExpectedSignature(descriptor = "genericListExactType", signature = "Ljava/util/List;")
+ List genericListExactType;
+
+ @ExpectedSignature(descriptor = "listWithGenericType", signature = "Ljava/util/List;")
+ List listWithGenericType;
+
+ List listNoSignatureAttribute;
+
+ // no Signature attribute
+ InnerClass1(List a) {
+ }
+
+ @ExpectedSignature(descriptor = "(InnerClassTest, java.util.ArrayList)",
+ signature = "(TT;)V")
+ InnerClass1(T a) {
+ }
+
+ @ExpectedSignature(descriptor = "(InnerClassTest, java.util.ArrayList, java.util.ArrayList)",
+ signature = "(TT;TE;)V")
+ InnerClass1(T a, E b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericMethod(java.util.ArrayList)",
+ signature = "(TT;)TE;")
+ E genericMethod(T a) {
+ return null;
+ }
+ }
+
+ @ExpectedSignature(descriptor = "InnerClassTest$InnerInterface",
+ signature = "Ljava/lang/Object;")
+ interface InnerInterface {
+ @ExpectedSignature(descriptor = "genericMethod(java.lang.Object)", signature = "(TT;)TT;")
+ T genericMethod(T a);
+
+ @ExpectedSignature(descriptor = "genericListExtendsBound", signature = "Ljava/util/List<+Ljava/lang/Number;>;")
+ List genericListExtendsBound = null;
+
+ @ExpectedSignature(descriptor = "genericListSuperBound", signature = "Ljava/util/List<-Ljava/lang/Number;>;")
+ List genericListSuperBound = null;
+
+ @ExpectedSignature(descriptor = "genericListWildCard", signature = "Ljava/util/List<*>;")
+ List genericListWildCard = null;
+
+ @ExpectedSignature(descriptor = "genericListExactType", signature = "Ljava/util/List;")
+ List genericListExactType = null;
+
+ List listNoSignatureAttribute = null;
+
+ @ExpectedSignature(descriptor = "genericBoundsMethod1(java.util.List)",
+ signature = "(Ljava/util/List<-TT;>;)Ljava/util/List<+TT;>;")
+ List genericBoundsMethod1(List a);
+
+ @ExpectedSignature(descriptor = "genericBoundsMethod2(java.util.List)",
+ signature = "(Ljava/util/List<+TT;>;)Ljava/util/List<-TT;>;")
+ List genericBoundsMethod2(List a);
+
+ @ExpectedSignature(descriptor = "genericWildCardMethod(java.util.Map)",
+ signature = "(Ljava/util/Map<**>;)Ljava/util/Map<**>;")
+ Map genericWildCardMethod(Map a);
+
+ @ExpectedSignature(descriptor = "defaultGenericMethod(java.util.List, java.util.List, java.util.Map)",
+ signature = "(Ljava/util/List<+TT;>;Ljava/util/List<-TT;>;Ljava/util/Map<**>;)Ljava/util/List<*>;")
+ default List defaultGenericMethod(List list1, List list2, Map map) { return null; }
+
+
+ default List defaultNoSignatureAttributeMethod(List list1, List list2, Map list3) { return null; }
+
+ @ExpectedSignature(descriptor = "staticGenericMethod(java.util.List, java.util.List, java.util.Map)",
+ signature = "(Ljava/util/List<+TT;>;Ljava/util/List<-TT;>;Ljava/util/Map<**>;)Ljava/util/List<*>;")
+ static List staticGenericMethod(List list1, List list2, Map map) { return null; }
+
+
+ static List staticNoSignatureAttributeMethod(List list1, List list2, Map list3) { return null; }
+ }
+
+ @ExpectedSignature(descriptor = "InnerClassTest$InnerClass2",
+ signature = "LInnerClassTest.InnerClass1;>;LInnerClassTest$InnerInterface;")
+ class InnerClass2 extends InnerClass1> implements InnerInterface {
+
+ // no Signature attribute
+ InnerClass2() {
+ super(null);
+ }
+
+ @ExpectedSignature(descriptor = "(InnerClassTest, java.util.ArrayList)",
+ signature = "(TT;)V")
+ InnerClass2(T a) {
+ super(a);
+ }
+
+ @ExpectedSignature(descriptor = "(InnerClassTest, java.util.ArrayList, java.util.ArrayList)",
+ signature = "(TT;TT;)V")
+ InnerClass2(T a, T b) {
+ super(a, b);
+ }
+
+ @ExpectedSignature(descriptor = "genericMethod(java.util.ArrayList)", signature = "(TT;)TT;")
+ @Override
+ public T genericMethod(T a) {
+ return null;
+ }
+
+ @ExpectedSignature(descriptor = "genericBoundsMethod1(java.util.List)",
+ signature = "(Ljava/util/List<-TT;>;)Ljava/util/List<+TT;>;")
+ @Override
+ public List genericBoundsMethod1(List a) {
+ return null;
+ }
+
+ @ExpectedSignature(descriptor = "genericBoundsMethod2(java.util.List)",
+ signature = "(Ljava/util/List<+TT;>;)Ljava/util/List<-TT;>;")
+ @Override
+ public List genericBoundsMethod2(List a) {
+ return null;
+ }
+
+ @ExpectedSignature(descriptor = "genericWildCardMethod(java.util.Map)",
+ signature = "(Ljava/util/Map<**>;)Ljava/util/Map<**>;")
+ @Override
+ public Map genericWildCardMethod(Map a) {
+ return null;
+ }
+ }
+
+ @ExpectedSignature(descriptor = "InnerClassTest$StaticInnerClass",
+ signature = ";>" +
+ "Ljava/lang/Object;LInnerClassTest$InnerInterface;")
+ static class StaticInnerClass> implements InnerInterface {
+ // no Signature attribute
+ StaticInnerClass(List a) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Runnable)",
+ signature = "(TE;)V")
+ StaticInnerClass(E a) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.String)",
+ signature = "(TT;)V")
+ StaticInnerClass(T a) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.String, java.util.Set)",
+ signature = "(TT;TE;)V")
+ StaticInnerClass(T a, E b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericListExtendsBound", signature = "Ljava/util/List<+Ljava/lang/Number;>;")
+ static List genericListExtendsBound;
+
+ @ExpectedSignature(descriptor = "genericListSuperBound", signature = "Ljava/util/List<-Ljava/lang/Number;>;")
+ static List genericListSuperBound;
+
+ @ExpectedSignature(descriptor = "genericListWildCard", signature = "Ljava/util/List<*>;")
+ static List genericListWildCard;
+
+ @ExpectedSignature(descriptor = "genericListExactType", signature = "Ljava/util/List;")
+ static List genericListExactType;
+
+ static List listNoSignatureAttribute;
+
+ @ExpectedSignature(descriptor = "genericMethod(java.util.Set)",
+ signature = "(TE;)TE;")
+ @Override
+ public E genericMethod(E a) {
+ return null;
+ }
+
+ @ExpectedSignature(descriptor = "genericBoundsMethod1(java.util.List)",
+ signature = "(Ljava/util/List<-TE;>;)Ljava/util/List<+TE;>;")
+ @Override
+ public List genericBoundsMethod1(List a) {
+ return null;
+ }
+
+ @ExpectedSignature(descriptor = "genericBoundsMethod2(java.util.List)",
+ signature = "(Ljava/util/List<+TE;>;)Ljava/util/List<-TE;>;")
+ @Override
+ public List genericBoundsMethod2(List a) {
+ return null;
+ }
+
+ @ExpectedSignature(descriptor = "genericWildCardMethod(java.util.Map)",
+ signature = "(Ljava/util/Map<**>;)Ljava/util/Map<**>;")
+ @Override
+ public Map genericWildCardMethod(Map a) {
+ return null;
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericMethod(java.lang.Object)",
+ signature = "(TE;)TE;")
+ public static E staticGenericMethod(E a) {
+ return null;
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericBoundsMethod1(java.util.List)",
+ signature = "(Ljava/util/List<-TE;>;)Ljava/util/List<+TE;>;")
+ public static List staticGenericBoundsMethod1(List a) {
+ return null;
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericBoundsMethod2(java.util.List)",
+ signature = "(Ljava/util/List<+TE;>;)Ljava/util/List<-TE;>;")
+ public static List staticGenericBoundsMethod2(List a) {
+ return null;
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericWildCardMethod(java.util.Map)",
+ signature = "(Ljava/util/Map<**>;)Ljava/util/Map<**>;")
+ public static Map staticGenericWildCardMethod(Map a) {
+ return null;
+ }
+ }
+
+ @ExpectedSignature(descriptor = "InnerClassTest$InnerClass3",
+ signature = "Ljava/lang/Object;LInnerClassTest$ExceptionHolder" +
+ ";Ljava/util/concurrent/Callable;>;")
+ public static class InnerClass3 implements ExceptionHolder, Callable> {
+ @ExpectedSignature(descriptor = "call()", signature = "()Ljava/util/Map<**>;")
+ @Override
+ public Map call() throws Exception {
+ return null;
+ }
+
+ @Override
+ public void Throw() throws RuntimeException {
+ }
+
+ @Override
+ public RuntimeException Return() {
+ return null;
+ }
+ }
+
+ /**
+ * Class is for checking that the Signature attribute is not generated
+ * for overridden methods despite of the appropriate methods in the parent class
+ * have the Signature attribute.
+ */
+ @ExpectedSignature(descriptor = "InnerClassTest$ExceptionHolder",
+ signature = "Ljava/lang/Object;")
+ interface ExceptionHolder {
+ @ExpectedSignature(descriptor = "Throw()", signature = "()V^TE;")
+ void Throw() throws E;
+ @ExpectedSignature(descriptor = "Return()", signature = "()TE;")
+ E Return();
+ }
+}
diff -r d47c58140b41 -r 427f83353f73 langtools/test/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/classfiles/attributes/Signature/MethodParameterTest.java Mon Apr 06 10:35:43 2015 -0700
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2015, 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 8049238
+ * @summary Checks Signature attribute for method parameters.
+ * @library /tools/lib /tools/javac/lib ../lib
+ * @build TestBase TestResult InMemoryFileManager ToolBox
+ * @build MethodParameterTest Driver ExpectedSignature ExpectedSignatureContainer
+ * @run main Driver MethodParameterTest
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@ExpectedSignature(descriptor = "MethodParameterTest", signature = "Ljava/lang/Object;")
+public class MethodParameterTest {
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, java.util.Set, java.util.ArrayList)",
+ signature = ";:Ljava/lang/Runnable;>" +
+ "(TT;Ljava/util/Set<-TE;>;Ljava/util/ArrayList<+Ljava/util/Set;>;)V")
+ & Runnable>
+ MethodParameterTest(T a, Set b, ArrayList> c) {
+ }
+
+ @ExpectedSignature(descriptor = "method(java.lang.Object, java.util.List, java.util.ArrayList)",
+ signature = ";:Ljava/lang/Runnable;>" +
+ "(TT;TU;Ljava/util/ArrayList<+Ljava/util/Set;>;)V")
+ & Runnable>
+ void method(T a, U b, ArrayList> c) {
+ }
+
+ @ExpectedSignature(descriptor = "staticMethod(java.util.Set, java.util.List[], java.util.Map)",
+ signature = ";E::Ljava/util/Set<-TT;>;>(TE;[TT;Ljava/util/Map<*+TE;>;)TE;")
+ static , E extends Set> E staticMethod(E a, T[] b, Map c) {
+ return null;
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, boolean[])", signature = "(TT;[Z)V")
+ MethodParameterTest(T a, boolean...b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, char[])", signature = "(TT;[C)V")
+ MethodParameterTest(T a, char...b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, byte[])", signature = "(TT;[B)V")
+ MethodParameterTest(T a, byte...b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, short[])", signature = "(TT;[S)V")
+ MethodParameterTest(T a, short...b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, int[])", signature = "(TT;[I)V")
+ MethodParameterTest(T a, int...b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, long[])", signature = "(TT;[J)V")
+ MethodParameterTest(T a, long...b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, float[])", signature = "(TT;[F)V")
+ MethodParameterTest(T a, float...b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, double[])", signature = "(TT;[D)V")
+ MethodParameterTest(T a, double...b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object, java.lang.Object[])",
+ signature = "(TT;[Ljava/lang/Object;)V")
+ MethodParameterTest(T a, Object...b) {
+ }
+
+ @ExpectedSignature(descriptor = "(java.lang.Object[])", signature = "([TT;)V")
+ MethodParameterTest(T...a) {
+ }
+
+ // no Signature attribute
+ MethodParameterTest(int...a) {
+ }
+
+ @ExpectedSignature(descriptor = "genericBooleanMethod(java.lang.Object, boolean[])", signature = "(TT;[Z)V")
+ void genericBooleanMethod(T a, boolean...b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericCharMethod(java.lang.Object, char[])", signature = "(TT;[C)V")
+ void genericCharMethod(T a, char...b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericByteMethod(java.lang.Object, byte[])", signature = "(TT;[B)V")
+ void genericByteMethod(T a, byte...b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericShortMethod(java.lang.Object, short[])", signature = "(TT;[S)V")
+ void genericShortMethod(T a, short...b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericIntMethod(java.lang.Object, int[])", signature = "(TT;[I)V")
+ void genericIntMethod(T a, int...b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericLongMethod(java.lang.Object, long[])", signature = "(TT;[J)V")
+ void genericLongMethod(T a, long...b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericFloatMethod(java.lang.Object, float[])", signature = "(TT;[F)V")
+ void genericFloatMethod(T a, float...b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericDoubleMethod(java.lang.Object, double[])", signature = "(TT;[D)V")
+ void genericDoubleMethod(T a, double...b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericObjectMethod(java.lang.Object, java.lang.Object[])",
+ signature = "(TT;[Ljava/lang/Object;)V")
+ void genericObjectMethod(T a, Object...b) {
+ }
+
+ @ExpectedSignature(descriptor = "genericMethod(java.lang.Object[])", signature = "([TT;)V")
+ void genericMethod(T...a) {
+ }
+
+ void noSignature(int...a) {
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericBooleanMethod(java.lang.Object, boolean[])",
+ signature = "(TT;[Z)V")
+ static void staticGenericBooleanMethod(T a, boolean...b) {
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericCharMethod(java.lang.Object, char[])",
+ signature = "(TT;[C)V")
+ static void staticGenericCharMethod(T a, char...b) {
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericByteMethod(java.lang.Object, byte[])",
+ signature = "(TT;[B)V")
+ static void staticGenericByteMethod(T a, byte...b) {
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericShortMethod(java.lang.Object, short[])",
+ signature = "(TT;[S)V")
+ static void staticGenericShortMethod(T a, short...b) {
+ }
+
+ @ExpectedSignature(descriptor = "staticGenericIntMethod(java.lang.Object, int[])",
+ signature = "(TT;[I)V")
+ static