am ec494368: Merge "Avoid wrapping Class in WeakReference when class loader is null."

* commit 'ec494368f467ca5235a6a52ff6b03b97141fa17d':
  Avoid wrapping Class in WeakReference when class loader is null.

1 files changed, 1 insertions, 7 deletions

diff --git a/luni/src/main/java/java/io/ObjectStreamField.java b/luni/src/main/java/java/io/ObjectStreamField.java
index 78a6903..2a9b107 100644
--- a/luni/src/main/java/java/io/ObjectStreamField.java
+++ b/luni/src/main/java/java/io/ObjectStreamField.java
@@ -58,13 +58,7 @@ public class ObjectStreamField implements Comparable<Object> {
      *             if {@code name} or {@code cl} is {@code null}.
      */
     public ObjectStreamField(String name, Class<?> cl) {
-        if (name == null) {
-            throw new NullPointerException("name == null");
-        } else if (cl == null) {
-            throw new NullPointerException("cl == null");
-        }
-        this.name = name;
-        this.type = new WeakReference<Class<?>>(cl);
+        this(name, cl, false);
     }
 
     /**