--- a/jdk/.hgtags Thu Apr 27 14:40:20 2017 +0200
+++ b/jdk/.hgtags Fri May 05 17:48:44 2017 +0200
@@ -412,3 +412,7 @@
a7942c3b1e59495dbf51dc7c41aab355fcd253d7 jdk-9+165
5d2b48f1f0a322aca719b49ff02ab421705bffc7 jdk-9+166
5adecda6cf9a5623f983ea29e5511755ccfd1273 jdk-10+2
+4723e1d233195e253f018e8a46732c7ffbe6ce90 jdk-10+3
+37f8b938b680cf8fb551e9a48bffc5536b061fa8 jdk-10+4
+d1436b2945383cef15edbdba9bb41ef1656c987b jdk-10+5
+329609d00aef2443cf1e44ded94637c5ed55a143 jdk-10+6
--- a/jdk/src/java.base/share/classes/java/lang/Math.java Thu Apr 27 14:40:20 2017 +0200
+++ b/jdk/src/java.base/share/classes/java/lang/Math.java Fri May 05 17:48:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2017, 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
@@ -1442,8 +1442,8 @@
}
// Use raw bit-wise conversions on guaranteed non-NaN arguments.
- private static long negativeZeroFloatBits = Float.floatToRawIntBits(-0.0f);
- private static long negativeZeroDoubleBits = Double.doubleToRawLongBits(-0.0d);
+ private static final long negativeZeroFloatBits = Float.floatToRawIntBits(-0.0f);
+ private static final long negativeZeroDoubleBits = Double.doubleToRawLongBits(-0.0d);
/**
* Returns the greater of two {@code float} values. That is,
--- a/jdk/src/java.base/share/classes/java/util/stream/FindOps.java Thu Apr 27 14:40:20 2017 +0200
+++ b/jdk/src/java.base/share/classes/java/util/stream/FindOps.java Fri May 05 17:48:44 2017 +0200
@@ -54,9 +54,10 @@
* first element in the encounter order
* @return a {@code TerminalOp} implementing the find operation
*/
+ @SuppressWarnings("unchecked")
public static <T> TerminalOp<T, Optional<T>> makeRef(boolean mustFindFirst) {
- return new FindOp<>(mustFindFirst, StreamShape.REFERENCE, Optional.empty(),
- Optional::isPresent, FindSink.OfRef::new);
+ return (TerminalOp<T, Optional<T>>)
+ (mustFindFirst ? FindSink.OfRef.OP_FIND_FIRST : FindSink.OfRef.OP_FIND_ANY);
}
/**
@@ -67,8 +68,7 @@
* @return a {@code TerminalOp} implementing the find operation
*/
public static TerminalOp<Integer, OptionalInt> makeInt(boolean mustFindFirst) {
- return new FindOp<>(mustFindFirst, StreamShape.INT_VALUE, OptionalInt.empty(),
- OptionalInt::isPresent, FindSink.OfInt::new);
+ return mustFindFirst ? FindSink.OfInt.OP_FIND_FIRST : FindSink.OfInt.OP_FIND_ANY;
}
/**
@@ -79,8 +79,7 @@
* @return a {@code TerminalOp} implementing the find operation
*/
public static TerminalOp<Long, OptionalLong> makeLong(boolean mustFindFirst) {
- return new FindOp<>(mustFindFirst, StreamShape.LONG_VALUE, OptionalLong.empty(),
- OptionalLong::isPresent, FindSink.OfLong::new);
+ return mustFindFirst ? FindSink.OfLong.OP_FIND_FIRST : FindSink.OfLong.OP_FIND_ANY;
}
/**
@@ -91,8 +90,7 @@
* @return a {@code TerminalOp} implementing the find operation
*/
public static TerminalOp<Double, OptionalDouble> makeDouble(boolean mustFindFirst) {
- return new FindOp<>(mustFindFirst, StreamShape.DOUBLE_VALUE, OptionalDouble.empty(),
- OptionalDouble::isPresent, FindSink.OfDouble::new);
+ return mustFindFirst ? FindSink.OfDouble.OP_FIND_FIRST : FindSink.OfDouble.OP_FIND_ANY;
}
/**
@@ -195,6 +193,14 @@
public Optional<T> get() {
return hasValue ? Optional.of(value) : null;
}
+
+ static final TerminalOp<?, ?> OP_FIND_FIRST = new FindOp<>(true,
+ StreamShape.REFERENCE, Optional.empty(),
+ Optional::isPresent, FindSink.OfRef::new);
+
+ static final TerminalOp<?, ?> OP_FIND_ANY = new FindOp<>(false,
+ StreamShape.REFERENCE, Optional.empty(),
+ Optional::isPresent, FindSink.OfRef::new);
}
/** Specialization of {@code FindSink} for int streams */
@@ -210,6 +216,13 @@
public OptionalInt get() {
return hasValue ? OptionalInt.of(value) : null;
}
+
+ static final TerminalOp<Integer, OptionalInt> OP_FIND_FIRST = new FindOp<>(true,
+ StreamShape.INT_VALUE, OptionalInt.empty(),
+ OptionalInt::isPresent, FindSink.OfInt::new);
+ static final TerminalOp<Integer, OptionalInt> OP_FIND_ANY = new FindOp<>(false,
+ StreamShape.INT_VALUE, OptionalInt.empty(),
+ OptionalInt::isPresent, FindSink.OfInt::new);
}
/** Specialization of {@code FindSink} for long streams */
@@ -225,6 +238,13 @@
public OptionalLong get() {
return hasValue ? OptionalLong.of(value) : null;
}
+
+ static final TerminalOp<Long, OptionalLong> OP_FIND_FIRST = new FindOp<>(true,
+ StreamShape.LONG_VALUE, OptionalLong.empty(),
+ OptionalLong::isPresent, FindSink.OfLong::new);
+ static final TerminalOp<Long, OptionalLong> OP_FIND_ANY = new FindOp<>(false,
+ StreamShape.LONG_VALUE, OptionalLong.empty(),
+ OptionalLong::isPresent, FindSink.OfLong::new);
}
/** Specialization of {@code FindSink} for double streams */
@@ -240,6 +260,13 @@
public OptionalDouble get() {
return hasValue ? OptionalDouble.of(value) : null;
}
+
+ static final TerminalOp<Double, OptionalDouble> OP_FIND_FIRST = new FindOp<>(true,
+ StreamShape.DOUBLE_VALUE, OptionalDouble.empty(),
+ OptionalDouble::isPresent, FindSink.OfDouble::new);
+ static final TerminalOp<Double, OptionalDouble> OP_FIND_ANY = new FindOp<>(false,
+ StreamShape.DOUBLE_VALUE, OptionalDouble.empty(),
+ OptionalDouble::isPresent, FindSink.OfDouble::new);
}
}
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java Thu Apr 27 14:40:20 2017 +0200
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java Fri May 05 17:48:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, 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
@@ -214,7 +214,7 @@
try {
byte[] extVal = xcert.getExtensionValue("2.5.29.14");
if (extVal == null) {
- if (debug != null) {
+ if (debug != null && Debug.isVerbose()) {
debug.println("AdaptableX509CertSelector.match: "
+ "no subject key ID extension. Subject: "
+ xcert.getSubjectX500Principal());
@@ -225,7 +225,7 @@
byte[] certSubjectKeyID = in.getOctetString();
if (certSubjectKeyID == null ||
!Arrays.equals(ski, certSubjectKeyID)) {
- if (debug != null) {
+ if (debug != null && Debug.isVerbose()) {
debug.println("AdaptableX509CertSelector.match: "
+ "subject key IDs don't match. "
+ "Expected: " + Arrays.toString(ski) + " "
@@ -234,7 +234,7 @@
return false;
}
} catch (IOException ex) {
- if (debug != null) {
+ if (debug != null && Debug.isVerbose()) {
debug.println("AdaptableX509CertSelector.match: "
+ "exception in subject key ID check");
}
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java Thu Apr 27 14:40:20 2017 +0200
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java Fri May 05 17:48:44 2017 +0200
@@ -117,7 +117,7 @@
// if this trust anchor is not worth trying,
// we move on to the next one
if (selector != null && !selector.match(trustedCert)) {
- if (debug != null) {
+ if (debug != null && Debug.isVerbose()) {
debug.println("NO - don't try this trustedCert");
}
continue;
--- a/jdk/src/java.base/share/classes/sun/security/util/Debug.java Thu Apr 27 14:40:20 2017 +0200
+++ b/jdk/src/java.base/share/classes/sun/security/util/Debug.java Fri May 05 17:48:44 2017 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, 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
@@ -25,6 +25,7 @@
package sun.security.util;
+import java.io.PrintStream;
import java.math.BigInteger;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
@@ -32,7 +33,7 @@
import sun.security.action.GetPropertyAction;
/**
- * A utility class for debuging.
+ * A utility class for debugging.
*
* @author Roland Schemers
*/
@@ -118,6 +119,7 @@
System.err.println("The following can be used with certpath:");
System.err.println();
System.err.println("ocsp dump the OCSP protocol exchanges");
+ System.err.println("verbose verbose debugging");
System.err.println();
System.err.println("Note: Separate multiple options with a comma");
System.exit(0);
@@ -166,6 +168,13 @@
}
/**
+ * Check if verbose messages is enabled for extra debugging.
+ */
+ public static boolean isVerbose() {
+ return isOn("verbose");
+ }
+
+ /**
* print a message to stderr that is prefixed with the prefix
* created from the call to getInstance.
*/
@@ -204,6 +213,13 @@
}
/**
+ * PrintStream for debug methods. Currently only System.err is supported.
+ */
+ public PrintStream getPrintStream() {
+ return System.err;
+ }
+
+ /**
* return a hexadecimal printed representation of the specified
* BigInteger object. the value is formatted to fit on lines of
* at least 75 characters, with embedded newlines. Words are
--- a/jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java Thu Apr 27 14:40:20 2017 +0200
+++ b/jdk/src/java.base/share/classes/sun/security/util/DisabledAlgorithmConstraints.java Fri May 05 17:48:44 2017 +0200
@@ -674,12 +674,11 @@
if (debug != null) {
debug.println("Checking if usage constraint \"" + v +
"\" matches \"" + cp.getVariant() + "\"");
- // Because usage checking can come from many places
- // a stack trace is very helpful.
- ByteArrayOutputStream ba = new ByteArrayOutputStream();
- PrintStream ps = new PrintStream(ba);
- (new Exception()).printStackTrace(ps);
- debug.println(ba.toString());
+ if (Debug.isVerbose()) {
+ // Because usage checking can come from many places
+ // a stack trace is very helpful.
+ (new Exception()).printStackTrace(debug.getPrintStream());
+ }
}
if (cp.getVariant().compareTo(v) == 0) {
if (next(cp)) {