Index: luni/src/main/java/java/util/EnumSet.java =================================================================== --- luni/src/main/java/java/util/EnumSet.java (revision 478105) +++ luni/src/main/java/java/util/EnumSet.java (working copy) @@ -307,30 +307,5 @@ boolean isValidType(Class cls) { return cls == elementClass || cls.getSuperclass() == elementClass; } - - private static class SerializationProxy> implements - Serializable { - private static final long serialVersionUID = 362491234563181265L; - - private Class elementType; - - private E[] elements; - - private Object readResolve() { - EnumSet set = EnumSet.noneOf(elementType); - for (E e : elements) { - set.add(e); - } - return set; - } - } - - @SuppressWarnings("unchecked") - private Object writeReplace() { - SerializationProxy proxy = new SerializationProxy(); - proxy.elements = (Enum[]) toArray(); - proxy.elementType = elementClass; - return proxy; - } }