commit 3cfbd328b810983ad924c17a5b45500a27c6a5a6
author Benoit Lamarche <benoitlamarche@google.com> Fri Nov 25 18:27:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 25 18:27:04 2016 +0000
tree d05ca094cdf42571c5ed2df43170ed7a990c6946
parent 9f1395aadb1c77e5f5e59739b9e154d1cb4159a3
parent d5c56fdb59b1bdb6dbffe2249a88487111a5653e

Merge "Mark empty LocalVariableList as sorted"
am: d5c56fdb59

Change-Id: Icee32624919d549296d2a6f4c8b2fcb168be0236

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 40fc90a..ad81363 100644
--- a/dx/src/com/android/dx/util/FixedSizeList.java
+++ b/dx/src/com/android/dx/util/FixedSizeList.java
@@ -36,6 +36,7 @@
      */
     public FixedSizeList(int size) {
         super(size != 0);
+        sorted = size == 0;
 
         try {
             arr = new Object[size];
@@ -278,11 +279,13 @@
 
     @SuppressWarnings("unchecked")
     protected <T> void sort(Comparator<T> comparator) {
-        throwIfImmutable();
+        if (!sorted) {
+            throwIfImmutable();
 
-        Arrays.<T>sort((T[]) arr, comparator);
-        setImmutable();
-        sorted = true;
+            Arrays.<T>sort((T[]) arr, comparator);
+            setImmutable();
+            sorted = true;
+        }
     }
 
     public boolean isSorted() {