josm-mirror: bumped externals

JOSM · Jan 22, 2017 · d0f7689 · d0f7689
1 parent 6f027ed
commit d0f7689
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java b/src/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorOutputStream.java
@@ -202,8 +202,8 @@ private byte[] expand(final int offset, final int length) {
         if (offset == 1) { // surprisingly common special case
             byte[] block = expandedBlocks.peekFirst();
             byte b = block[block.length - 1];
-            for (int i = 0; i < expanded.length; i++) {
-                expanded[i] = b;
+            if (b != 0) { // the fresh array contains 0s anyway
+                Arrays.fill(expanded, b);
             }
         } else {
             expandFromList(expanded, offset, length);
@@ -236,9 +236,6 @@ private void expandFromList(final byte[] expanded, int offset, int length) {
                 copyOffset = writeOffset  + offsetRemaining;
                 copyLen = Math.min(lengthRemaining, writeOffset + offsetRemaining);
             }
-            if (copyLen < 1) {
-                throw new IllegalStateException("zero copy");
-            }
             System.arraycopy(block, copyOffset, expanded, writeOffset, copyLen);
             offsetRemaining -= copyLen;
             lengthRemaining -= copyLen;

diff --git a/...rg/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java b/...rg/apache/commons/compress/compressors/lz77support/AbstractLZ77CompressorInputStream.java
@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 
 import org.apache.commons.compress.compressors.CompressorInputStream;
 import org.apache.commons.compress.utils.ByteUtils;
@@ -222,9 +223,8 @@ private void tryToCopy(int bytesToCopy) {
             // NOP
         } else if (backReferenceOffset == 1) { // pretty common special case
             final byte last = buf[writeIndex - 1];
-            for (int i = 0; i < copy; i++) {
-                buf[writeIndex++] = last;
-            }
+            Arrays.fill(buf, writeIndex, writeIndex + copy, last);
+            writeIndex += copy;
         } else if (copy < backReferenceOffset) {
             System.arraycopy(buf, writeIndex - backReferenceOffset, buf, writeIndex, copy);
             writeIndex += copy;