Merge "Revert "Mark empty LocalVariableList as sorted""

e2eee30d · Benoit Lamarche · Gerrit Code Review · 90aa7797 · 3ca3603a · e2eee30d
Commit e2eee30d authored 8 years ago by Benoit Lamarche Committed by Gerrit Code Review 8 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

dx/src/com/android/dx/util/FixedSizeList.java dx/src/com/android/dx/util/FixedSizeList.java +4 -7

No files found.
--- a/dx/src/com/android/dx/util/FixedSizeList.java
+++ b/dx/src/com/android/dx/util/FixedSizeList.java
@@ -36,7 +36,6 @@ public class FixedSizeList
     */
    public FixedSizeList(int size) {
        super(size != 0);
-        sorted = size == 0;

        try {
            arr = new Object[size];
@@ -279,13 +278,11 @@ public class FixedSizeList

    @SuppressWarnings("unchecked")
    protected <T> void sort(Comparator<T> comparator) {
-        if (!sorted) {
-            throwIfImmutable();
+        throwIfImmutable();

-            Arrays.<T>sort((T[]) arr, comparator);
-            setImmutable();
-            sorted = true;
-        }
+        Arrays.<T>sort((T[]) arr, comparator);
+        setImmutable();
+        sorted = true;
    }

    public boolean isSorted() {