commit 8d1430e1d9cb3ac5c85b3d75119260cb44791f7f
author Elliott Hughes <enh@google.com> Wed Feb 13 23:42:05 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 13 23:42:06 2013 +0000
tree c05d696944401f02326d37d630b6f3cafa61efbe
parent 9e6d7ff10c740c0ef35292f2af8cb85dc488b443
parent ec7e47659aba15fae49d1a7296ab06a928af0864

Merge "Admit that we can't really fix DateFormatSymbols serialization..."

luni/src/main/java/java/util/ArrayList.java

diff --git a/luni/src/main/java/java/util/ArrayList.java b/luni/src/main/java/java/util/ArrayList.java
index d193eec..8a3218d 100644
--- a/luni/src/main/java/java/util/ArrayList.java
+++ b/luni/src/main/java/java/util/ArrayList.java
@@ -90,6 +90,10 @@
      *            the collection of elements to add.
      */
     public ArrayList(Collection<? extends E> collection) {
+        if (collection == null) {
+            throw new NullPointerException("collection == null");
+        }
+
         Object[] a = collection.toArray();
         if (a.getClass() != Object[].class) {
             Object[] newArray = new Object[a.length];

support/src/test/java/libcore/java/security/TestKeyStore.java

diff --git a/support/src/test/java/libcore/java/security/TestKeyStore.java b/support/src/test/java/libcore/java/security/TestKeyStore.java
index e24ee78..74c2840 100644
--- a/support/src/test/java/libcore/java/security/TestKeyStore.java
+++ b/support/src/test/java/libcore/java/security/TestKeyStore.java
@@ -528,8 +528,12 @@
         if (!permittedNameConstraints.isEmpty() || !excludedNameConstraints.isEmpty()) {
             x509cg.addExtension(X509Extensions.NameConstraints,
                                 true,
-                                new NameConstraints(permittedNameConstraints,
-                                                    excludedNameConstraints));
+                                new NameConstraints(permittedNameConstraints.toArray(
+                                                        new GeneralSubtree[
+                                                            permittedNameConstraints.size()]),
+                                                    excludedNameConstraints.toArray(
+                                                        new GeneralSubtree[
+                                                            excludedNameConstraints.size()])));
         }
 
         if (privateKey instanceof ECPrivateKey) {