In ImmutableDoubleArray and ImmutableLongArray, use Arrays.copyOf whe…

…n expanding the internal array. In ImmutableIntArray, where we already made this change, remove an inconsistent `this.`. RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=318294443
google · Jun 30, 2020 · 689d2b3 · 689d2b3
1 parent 2814650
commit 689d2b3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 14 deletions.
diff --git a/android/guava/src/com/google/common/primitives/ImmutableDoubleArray.java b/android/guava/src/com/google/common/primitives/ImmutableDoubleArray.java
@@ -265,9 +265,7 @@ public Builder addAll(ImmutableDoubleArray values) {
     private void ensureRoomFor(int numberToAdd) {
       int newCount = count + numberToAdd; // TODO(kevinb): check overflow now?
       if (newCount > array.length) {
-        double[] newArray = new double[expandedCapacity(array.length, newCount)];
-        System.arraycopy(array, 0, newArray, 0, count);
-        this.array = newArray;
+        array = Arrays.copyOf(array, expandedCapacity(array.length, newCount));
       }
     }
 

diff --git a/android/guava/src/com/google/common/primitives/ImmutableIntArray.java b/android/guava/src/com/google/common/primitives/ImmutableIntArray.java
@@ -262,7 +262,7 @@ public Builder addAll(ImmutableIntArray values) {
     private void ensureRoomFor(int numberToAdd) {
       int newCount = count + numberToAdd; // TODO(kevinb): check overflow now?
       if (newCount > array.length) {
-        this.array = Arrays.copyOf(array, expandedCapacity(array.length, newCount));
+        array = Arrays.copyOf(array, expandedCapacity(array.length, newCount));
       }
     }
 

diff --git a/android/guava/src/com/google/common/primitives/ImmutableLongArray.java b/android/guava/src/com/google/common/primitives/ImmutableLongArray.java
@@ -264,9 +264,7 @@ public Builder addAll(ImmutableLongArray values) {
     private void ensureRoomFor(int numberToAdd) {
       int newCount = count + numberToAdd; // TODO(kevinb): check overflow now?
       if (newCount > array.length) {
-        long[] newArray = new long[expandedCapacity(array.length, newCount)];
-        System.arraycopy(array, 0, newArray, 0, count);
-        this.array = newArray;
+        array = Arrays.copyOf(array, expandedCapacity(array.length, newCount));
       }
     }
 

diff --git a/guava/src/com/google/common/primitives/ImmutableDoubleArray.java b/guava/src/com/google/common/primitives/ImmutableDoubleArray.java
@@ -294,9 +294,7 @@ public Builder addAll(ImmutableDoubleArray values) {
     private void ensureRoomFor(int numberToAdd) {
       int newCount = count + numberToAdd; // TODO(kevinb): check overflow now?
       if (newCount > array.length) {
-        double[] newArray = new double[expandedCapacity(array.length, newCount)];
-        System.arraycopy(array, 0, newArray, 0, count);
-        this.array = newArray;
+        array = Arrays.copyOf(array, expandedCapacity(array.length, newCount));
       }
     }
 

diff --git a/guava/src/com/google/common/primitives/ImmutableIntArray.java b/guava/src/com/google/common/primitives/ImmutableIntArray.java
@@ -291,7 +291,7 @@ public Builder addAll(ImmutableIntArray values) {
     private void ensureRoomFor(int numberToAdd) {
       int newCount = count + numberToAdd; // TODO(kevinb): check overflow now?
       if (newCount > array.length) {
-        this.array = Arrays.copyOf(array, expandedCapacity(array.length, newCount));
+        array = Arrays.copyOf(array, expandedCapacity(array.length, newCount));
       }
     }
 

diff --git a/guava/src/com/google/common/primitives/ImmutableLongArray.java b/guava/src/com/google/common/primitives/ImmutableLongArray.java
@@ -293,9 +293,7 @@ public Builder addAll(ImmutableLongArray values) {
     private void ensureRoomFor(int numberToAdd) {
       int newCount = count + numberToAdd; // TODO(kevinb): check overflow now?
       if (newCount > array.length) {
-        long[] newArray = new long[expandedCapacity(array.length, newCount)];
-        System.arraycopy(array, 0, newArray, 0, count);
-        this.array = newArray;
+        array = Arrays.copyOf(array, expandedCapacity(array.length, newCount));
       }
     }