diff options
29 files changed, 30 insertions, 31 deletions
diff --git a/archive/src/main/java/java/util/jar/Attributes.java b/archive/src/main/java/java/util/jar/Attributes.java index 4ee94df..159a0cd 100644 --- a/archive/src/main/java/java/util/jar/Attributes.java +++ b/archive/src/main/java/java/util/jar/Attributes.java @@ -437,7 +437,7 @@ public class Attributes implements Cloneable, Map<Object, Object> { try { clone = (Attributes) super.clone(); } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } clone.map = (Map<Object, Object>) ((HashMap) map).clone(); return clone; diff --git a/luni/src/main/java/java/util/BitSet.java b/luni/src/main/java/java/util/BitSet.java index 4e01cbf..f88ca7d 100644 --- a/luni/src/main/java/java/util/BitSet.java +++ b/luni/src/main/java/java/util/BitSet.java @@ -131,7 +131,7 @@ public class BitSet implements Serializable, Cloneable { clone.bits = bits.clone(); return clone; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/Calendar.java b/luni/src/main/java/java/util/Calendar.java index 0ac574c..49a8c3f 100644 --- a/luni/src/main/java/java/util/Calendar.java +++ b/luni/src/main/java/java/util/Calendar.java @@ -790,7 +790,7 @@ public abstract class Calendar implements Serializable, Cloneable, clone.zone = (TimeZone) zone.clone(); return clone; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/Date.java b/luni/src/main/java/java/util/Date.java index 80610d3..37f5b6a 100644 --- a/luni/src/main/java/java/util/Date.java +++ b/luni/src/main/java/java/util/Date.java @@ -193,7 +193,7 @@ public class Date implements Serializable, Cloneable, Comparable<Date> { try { return super.clone(); } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/EnumMap.java b/luni/src/main/java/java/util/EnumMap.java index 975fdad..2b33175 100644 --- a/luni/src/main/java/java/util/EnumMap.java +++ b/luni/src/main/java/java/util/EnumMap.java @@ -470,7 +470,7 @@ public class EnumMap<K extends Enum<K>, V> extends AbstractMap<K, V> implements enumMap.initialization(this); return enumMap; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/EnumSet.java b/luni/src/main/java/java/util/EnumSet.java index d49d900..c2c3fc0 100644 --- a/luni/src/main/java/java/util/EnumSet.java +++ b/luni/src/main/java/java/util/EnumSet.java @@ -322,7 +322,7 @@ public abstract class EnumSet<E extends Enum<E>> extends AbstractSet<E> Object set = super.clone(); return (EnumSet<E>) set; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/HashSet.java b/luni/src/main/java/java/util/HashSet.java index 4c97ca5..aa5c3fb 100644 --- a/luni/src/main/java/java/util/HashSet.java +++ b/luni/src/main/java/java/util/HashSet.java @@ -121,7 +121,7 @@ public class HashSet<E> extends AbstractSet<E> implements Set<E>, Cloneable, clone.backingMap = (HashMap<E, HashSet<E>>) backingMap.clone(); return clone; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/IdentityHashMap.java b/luni/src/main/java/java/util/IdentityHashMap.java index 053de1d..8d0f036 100644 --- a/luni/src/main/java/java/util/IdentityHashMap.java +++ b/luni/src/main/java/java/util/IdentityHashMap.java @@ -758,7 +758,7 @@ public class IdentityHashMap<K, V> extends AbstractMap<K, V> implements elementData.length); return cloneHashMap; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/LinkedList.java b/luni/src/main/java/java/util/LinkedList.java index 64326e3..7a7e81f 100644 --- a/luni/src/main/java/java/util/LinkedList.java +++ b/luni/src/main/java/java/util/LinkedList.java @@ -402,7 +402,7 @@ public class LinkedList<E> extends AbstractSequentialList<E> implements l.addAll(this); return l; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/Locale.java b/luni/src/main/java/java/util/Locale.java index 3d724d0..22cda76 100644 --- a/luni/src/main/java/java/util/Locale.java +++ b/luni/src/main/java/java/util/Locale.java @@ -277,7 +277,7 @@ public final class Locale implements Cloneable, Serializable { try { return super.clone(); } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/MapEntry.java b/luni/src/main/java/java/util/MapEntry.java index 6a5bf0f..b84697b 100644 --- a/luni/src/main/java/java/util/MapEntry.java +++ b/luni/src/main/java/java/util/MapEntry.java @@ -43,7 +43,7 @@ class MapEntry<K, V> implements Map.Entry<K, V>, Cloneable { try { return super.clone(); } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/TimeZone.java b/luni/src/main/java/java/util/TimeZone.java index b4878ca..09dcae2 100644 --- a/luni/src/main/java/java/util/TimeZone.java +++ b/luni/src/main/java/java/util/TimeZone.java @@ -149,7 +149,7 @@ public abstract class TimeZone implements Serializable, Cloneable { TimeZone zone = (TimeZone) super.clone(); return zone; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/TreeMap.java b/luni/src/main/java/java/util/TreeMap.java index b97821f..67b39e8 100644 --- a/luni/src/main/java/java/util/TreeMap.java +++ b/luni/src/main/java/java/util/TreeMap.java @@ -61,7 +61,7 @@ class MapEntry implements Map.Entry<K, V>, Cloneable { try { return super.clone(); } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } @@ -1065,7 +1065,7 @@ class MapEntry implements Map.Entry<K, V>, Cloneable { } return clone; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/TreeSet.java b/luni/src/main/java/java/util/TreeSet.java index 375b9c8..fcd6224 100644 --- a/luni/src/main/java/java/util/TreeSet.java +++ b/luni/src/main/java/java/util/TreeSet.java @@ -160,7 +160,7 @@ public class TreeSet<E> extends AbstractSet<E> implements SortedSet<E>, } return clone; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/java/util/Vector.java b/luni/src/main/java/java/util/Vector.java index 6a4060a..9a1b81c 100644 --- a/luni/src/main/java/java/util/Vector.java +++ b/luni/src/main/java/java/util/Vector.java @@ -265,7 +265,7 @@ public class Vector<E> extends AbstractList<E> implements List<E>, vector.elementData = elementData.clone(); return vector; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java index 24be092..bdd1d0a 100644 --- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java +++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java @@ -88,7 +88,7 @@ public class Header implements Cloneable { } return clone; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java index e5e3c11..9bd09b4 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java @@ -212,7 +212,7 @@ public class AbstractMapTest extends junit.framework.TestCase { try { return super.clone(); } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } } diff --git a/luni/src/test/java/tests/api/java/util/AbstractMapTest.java b/luni/src/test/java/tests/api/java/util/AbstractMapTest.java index c6a612c..7feb001 100644 --- a/luni/src/test/java/tests/api/java/util/AbstractMapTest.java +++ b/luni/src/test/java/tests/api/java/util/AbstractMapTest.java @@ -211,7 +211,7 @@ public class AbstractMapTest extends junit.framework.TestCase { try { return super.clone(); } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } } diff --git a/math/src/test/java/tests/api/java/math/BigIntegerTest.java b/math/src/test/java/tests/api/java/math/BigIntegerTest.java index d04f742..b84aa17 100644 --- a/math/src/test/java/tests/api/java/math/BigIntegerTest.java +++ b/math/src/test/java/tests/api/java/math/BigIntegerTest.java @@ -1299,7 +1299,7 @@ public class BigIntegerTest extends junit.framework.TestCase { try { return super.clone(); } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } } diff --git a/security/src/main/java/java/security/cert/PKIXCertPathChecker.java b/security/src/main/java/java/security/cert/PKIXCertPathChecker.java index 710ac11..5eaac74 100644 --- a/security/src/main/java/java/security/cert/PKIXCertPathChecker.java +++ b/security/src/main/java/java/security/cert/PKIXCertPathChecker.java @@ -55,7 +55,7 @@ public abstract class PKIXCertPathChecker implements Cloneable { try { return super.clone(); } catch (CloneNotSupportedException e) { - throw new Error(e); + throw new AssertionError(e); // android-changed } } diff --git a/security/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java b/security/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java index 7d80ae5..d82c699 100644 --- a/security/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java +++ b/security/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java @@ -99,8 +99,7 @@ public class PKIXCertPathValidatorResult implements CertPathValidatorResult { try { return super.clone(); } catch (CloneNotSupportedException e) { - // Actually, the exception will not be thrown out. - throw new Error(e); + throw new AssertionError(e); // android-changed } } diff --git a/security/src/main/java/java/security/cert/PKIXParameters.java b/security/src/main/java/java/security/cert/PKIXParameters.java index 4034d21..79d3d5e 100644 --- a/security/src/main/java/java/security/cert/PKIXParameters.java +++ b/security/src/main/java/java/security/cert/PKIXParameters.java @@ -554,7 +554,7 @@ public class PKIXParameters implements CertPathParameters { } return ret; } catch (CloneNotSupportedException e) { - throw new Error(e); + throw new AssertionError(e); // android-changed } } diff --git a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreParameters.java b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreParameters.java index 6518c6f..1166b41 100644 --- a/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreParameters.java +++ b/support/src/test/java/org/apache/harmony/security/tests/support/cert/MyCertStoreParameters.java @@ -37,7 +37,7 @@ public class MyCertStoreParameters implements CertStoreParameters { try { return super.clone(); } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } } diff --git a/text/src/main/java/java/text/AttributedString.java b/text/src/main/java/java/text/AttributedString.java index 77bbf78..fe7aa0c 100644 --- a/text/src/main/java/java/text/AttributedString.java +++ b/text/src/main/java/java/text/AttributedString.java @@ -107,7 +107,7 @@ public class AttributedString { } return clone; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/text/src/main/java/java/text/BreakIterator.java b/text/src/main/java/java/text/BreakIterator.java index 3a08427..78870f0 100644 --- a/text/src/main/java/java/text/BreakIterator.java +++ b/text/src/main/java/java/text/BreakIterator.java @@ -524,7 +524,7 @@ public abstract class BreakIterator implements Cloneable { cloned.wrapped = (com.ibm.icu4jni.text.BreakIterator) wrapped.clone(); return cloned; } catch (CloneNotSupportedException e) { - throw new InternalError(e.getMessage()); + throw new AssertionError(e); // android-changed } } diff --git a/text/src/main/java/java/text/Collator.java b/text/src/main/java/java/text/Collator.java index 71ebb94..e954b8b 100644 --- a/text/src/main/java/java/text/Collator.java +++ b/text/src/main/java/java/text/Collator.java @@ -211,7 +211,7 @@ public abstract class Collator implements Comparator<Object>, Cloneable { clone.icuColl = (com.ibm.icu4jni.text.Collator) this.icuColl.clone(); return clone; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/text/src/main/java/java/text/DecimalFormatSymbols.java b/text/src/main/java/java/text/DecimalFormatSymbols.java index a71a4c6..46849ef 100644 --- a/text/src/main/java/java/text/DecimalFormatSymbols.java +++ b/text/src/main/java/java/text/DecimalFormatSymbols.java @@ -115,7 +115,7 @@ public final class DecimalFormatSymbols implements Cloneable, Serializable { symbols.patternChars = patternChars.clone(); return symbols; } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/text/src/main/java/java/text/Format.java b/text/src/main/java/java/text/Format.java index 3a6e49d..8abe605 100644 --- a/text/src/main/java/java/text/Format.java +++ b/text/src/main/java/java/text/Format.java @@ -84,7 +84,7 @@ public abstract class Format implements Serializable, Cloneable { try { return super.clone(); } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } diff --git a/text/src/main/java/java/text/StringCharacterIterator.java b/text/src/main/java/java/text/StringCharacterIterator.java index 8ef0341..ea60180 100644 --- a/text/src/main/java/java/text/StringCharacterIterator.java +++ b/text/src/main/java/java/text/StringCharacterIterator.java @@ -105,7 +105,7 @@ public final class StringCharacterIterator implements CharacterIterator { try { return super.clone(); } catch (CloneNotSupportedException e) { - return null; + throw new AssertionError(e); // android-changed } } |