commit 410922cee2ee6d1fccc3686f9e0397292669d1c8
author Benoit Lamarche <benoitlamarche@google.com> Thu Dec 01 17:11:22 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 01 17:11:22 2016 +0000
tree b719dbfeab5ed65d199260f52a6c9a8255771142
parent 07310f8ceb401c78e95a1fdd0588967876521f2c
parent e2eee30d45b5c52d48f858b13d222d283ad05aed

Merge "Revert "Mark empty LocalVariableList as sorted""
am: e2eee30d45

Change-Id: I0122c66ccf6131da3fb3d62a42bdf7ef7a4cc417

dx/src/com/android/dx/util/FixedSizeList.java

diff --git a/dx/src/com/android/dx/util/FixedSizeList.java b/dx/src/com/android/dx/util/FixedSizeList.java
index ad81363..40fc90a 100644
--- a/dx/src/com/android/dx/util/FixedSizeList.java
+++ b/dx/src/com/android/dx/util/FixedSizeList.java
@@ -36,7 +36,6 @@
      */
     public FixedSizeList(int size) {
         super(size != 0);
-        sorted = size == 0;
 
         try {
             arr = new Object[size];
@@ -279,13 +278,11 @@
 
     @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() {