1 |
|
/* |
2 |
< |
* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved. |
2 |
> |
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. |
3 |
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
|
* |
5 |
|
* This code is free software; you can redistribute it and/or modify it |
28 |
|
import java.util.function.Consumer; |
29 |
|
import java.util.function.Predicate; |
30 |
|
import java.util.function.UnaryOperator; |
31 |
+ |
import jdk.internal.misc.SharedSecrets; |
32 |
|
|
33 |
|
/** |
34 |
|
* Resizable-array implementation of the {@code List} interface. Implements |
746 |
|
final int from, final int end) { |
747 |
|
Objects.requireNonNull(c); |
748 |
|
final Object[] es = elementData; |
748 |
– |
final boolean modified; |
749 |
|
int r; |
750 |
|
// Optimize for initial run of survivors |
751 |
< |
for (r = from; r < end && c.contains(es[r]) == complement; r++) |
752 |
< |
; |
753 |
< |
if (modified = (r < end)) { |
754 |
< |
int w = r++; |
755 |
< |
try { |
756 |
< |
for (Object e; r < end; r++) |
757 |
< |
if (c.contains(e = es[r]) == complement) |
758 |
< |
es[w++] = e; |
759 |
< |
} catch (Throwable ex) { |
760 |
< |
// Preserve behavioral compatibility with AbstractCollection, |
761 |
< |
// even if c.contains() throws. |
762 |
< |
System.arraycopy(es, r, es, w, end - r); |
763 |
< |
w += end - r; |
764 |
< |
throw ex; |
765 |
< |
} finally { |
766 |
< |
modCount += end - w; |
767 |
< |
shiftTailOverGap(es, w, end); |
768 |
< |
} |
751 |
> |
for (r = from;; r++) { |
752 |
> |
if (r == end) |
753 |
> |
return false; |
754 |
> |
if (c.contains(es[r]) != complement) |
755 |
> |
break; |
756 |
> |
} |
757 |
> |
int w = r++; |
758 |
> |
try { |
759 |
> |
for (Object e; r < end; r++) |
760 |
> |
if (c.contains(e = es[r]) == complement) |
761 |
> |
es[w++] = e; |
762 |
> |
} catch (Throwable ex) { |
763 |
> |
// Preserve behavioral compatibility with AbstractCollection, |
764 |
> |
// even if c.contains() throws. |
765 |
> |
System.arraycopy(es, r, es, w, end - r); |
766 |
> |
w += end - r; |
767 |
> |
throw ex; |
768 |
> |
} finally { |
769 |
> |
modCount += end - w; |
770 |
> |
shiftTailOverGap(es, w, end); |
771 |
|
} |
772 |
|
// checkInvariants(); |
773 |
< |
return modified; |
773 |
> |
return true; |
774 |
|
} |
775 |
|
|
776 |
|
/** |
789 |
|
int expectedModCount = modCount; |
790 |
|
s.defaultWriteObject(); |
791 |
|
|
792 |
< |
// Write out size as capacity for behavioural compatibility with clone() |
792 |
> |
// Write out size as capacity for behavioral compatibility with clone() |
793 |
|
s.writeInt(size); |
794 |
|
|
795 |
|
// Write out all elements in the proper order. |
821 |
|
|
822 |
|
if (size > 0) { |
823 |
|
// like clone(), allocate array based upon size not capacity |
824 |
+ |
SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size); |
825 |
|
Object[] elements = new Object[size]; |
826 |
|
|
827 |
|
// Read in all elements in the proper order. |