Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 10147:d7d221f56fd1 jdk8u25-b08
Merge
author | asaha |
---|---|
date | Wed, 16 Jul 2014 12:33:08 -0700 |
parents | cc4041406314 (current diff) 65b68b7458c7 (diff) |
children | 0c6cf43c5bcf |
files | .hgtags src/share/classes/java/util/Collections.java |
diffstat | 5 files changed, 131 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jun 27 10:26:39 2014 -0700 +++ b/.hgtags Wed Jul 16 12:33:08 2014 -0700 @@ -308,6 +308,7 @@ 5c0406ee9e820140b5322db006baed199c165b4f jdk8u20-b20 693025bbc45d683676fa78bb76201b665e0d8f2d jdk8u20-b21 0c2393744b29175de5204140d4dfbf12ca3d364f jdk8u20-b22 +be30cb2a3088f2b7b334b499f7eddbd5312312a7 jdk8u20-b23 abca9f6f1a10e9f91b2538bbe7870f54f550d986 jdk8u25-b00 7d0627679c9fdeaaaa9fe15c7cc11af0763621ec jdk8u25-b01 b0277ec994b751ebb761814675352506cd56bcd6 jdk8u25-b02
--- a/src/share/classes/java/util/Collections.java Fri Jun 27 10:26:39 2014 -0700 +++ b/src/share/classes/java/util/Collections.java Wed Jul 16 12:33:08 2014 -0700 @@ -3031,9 +3031,11 @@ final Collection<E> c; final Class<E> type; - void typeCheck(Object o) { + @SuppressWarnings("unchecked") + E typeCheck(Object o) { if (o != null && !type.isInstance(o)) throw new ClassCastException(badElementMsg(o)); + return (E) o; } private String badElementMsg(Object o) { @@ -3042,10 +3044,8 @@ } CheckedCollection(Collection<E> c, Class<E> type) { - if (c==null || type == null) - throw new NullPointerException(); - this.c = c; - this.type = type; + this.c = Objects.requireNonNull(c, "c"); + this.type = Objects.requireNonNull(type, "type"); } public int size() { return c.size(); } @@ -3088,7 +3088,7 @@ @SuppressWarnings("unchecked") Collection<E> checkedCopyOf(Collection<? extends E> coll) { - Object[] a = null; + Object[] a; try { E[] z = zeroLengthElementArray(); a = coll.toArray(z); @@ -3476,10 +3476,19 @@ return new CheckedList<>(list.subList(fromIndex, toIndex), type); } + /** + * {@inheritDoc} + * + * @throws ClassCastException if the class of an element returned by the + * operator prevents it from being added to this collection. The + * exception may be thrown after some elements of the list have + * already been replaced. + */ @Override public void replaceAll(UnaryOperator<E> operator) { - list.replaceAll(operator); - } + list.replaceAll(e -> typeCheck(operator.apply(e))); + } + @Override public void sort(Comparator<? super E> c) { list.sort(c);
--- a/src/share/classes/sun/security/smartcardio/CardImpl.java Fri Jun 27 10:26:39 2014 -0700 +++ b/src/share/classes/sun/security/smartcardio/CardImpl.java Wed Jul 16 12:33:08 2014 -0700 @@ -237,7 +237,16 @@ } } + private static final boolean invertReset = + Boolean.parseBoolean( + java.security.AccessController.doPrivileged( + new sun.security.action.GetPropertyAction( + "sun.security.smartcardio.invertCardReset", "false"))); + public void disconnect(boolean reset) throws CardException { + if (invertReset) { + reset = !reset; + } if (reset) { checkSecurity("reset"); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/util/Collections/CheckedListReplaceAll.java Wed Jul 16 12:33:08 2014 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2014, 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 8047795 + * @summary Ensure that replaceAll operator cannot add bad elements + * @author Mike Duigou + */ + +import java.util.*; +import java.util.function.UnaryOperator; + +public class CheckedListReplaceAll { + public static void main(String[] args) { + List unwrapped = Arrays.asList(new Object[]{1, 2, 3}); + List<Object> wrapped = Collections.checkedList(unwrapped, Integer.class); + + UnaryOperator evil = e -> (((int) e) % 2 != 0) ? e : "evil"; + + try { + wrapped.replaceAll(evil); + System.out.printf("Bwahaha! I have defeated you! %s\n", wrapped); + throw new RuntimeException("String added to checked List<Integer>"); + } catch (ClassCastException thwarted) { + thwarted.printStackTrace(System.out); + System.out.println("Curses! Foiled again!"); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/util/Collections/CheckedMapReplaceAll.java Wed Jul 16 12:33:08 2014 -0700 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2014, 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 8047795 + * @summary Ensure that replaceAll operator cannot add bad elements + * @author Mike Duigou + */ + +import java.util.*; +import java.util.function.BiFunction; + +public class CheckedMapReplaceAll { + public static void main(String[] args) { + Map<Integer,Double> unwrapped = new HashMap<>(); + unwrapped.put(1, 1.0); + unwrapped.put(2, 2.0); + unwrapped.put(3, 3.0); + + Map<Integer,Double> wrapped = Collections.checkedMap(unwrapped, Integer.class, Double.class); + + BiFunction evil = (k, v) -> (((int)k) % 2 != 0) ? v : "evil"; + + try { + wrapped.replaceAll(evil); + System.out.printf("Bwahaha! I have defeated you! %s\n", wrapped); + throw new RuntimeException("String added to checked Map<Integer,Double>"); + } catch (ClassCastException thwarted) { + thwarted.printStackTrace(System.out); + System.out.println("Curses! Foiled again!"); + } + } +}