|
 |
c620d6 |
From bba585e9e4fdfc67de3b53b58b8d60923e1ccd0c Mon Sep 17 00:00:00 2001
|
|
|
c620d6 |
From: Michael Simacek <msimacek@redhat.com>
|
|
|
c620d6 |
Date: Mon, 12 Feb 2018 10:53:48 +0100
|
|
|
c620d6 |
Subject: [PATCH 1/2] Remove Brotli compressor
|
|
|
c620d6 |
|
|
|
c620d6 |
---
|
|
|
c620d6 |
.../commons/compress/compressors/CompressorStreamFactory.java | 7 +------
|
|
|
c620d6 |
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
c620d6 |
|
|
|
c620d6 |
diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
|
|
|
c620d6 |
index d730b9d..ab178a9 100644
|
|
|
c620d6 |
--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
|
|
|
c620d6 |
+++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
|
|
|
c620d6 |
@@ -31,8 +31,6 @@ import java.util.Set;
|
|
|
c620d6 |
import java.util.SortedMap;
|
|
|
c620d6 |
import java.util.TreeMap;
|
|
|
c620d6 |
|
|
|
c620d6 |
-import org.apache.commons.compress.compressors.brotli.BrotliCompressorInputStream;
|
|
|
c620d6 |
-import org.apache.commons.compress.compressors.brotli.BrotliUtils;
|
|
|
c620d6 |
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
|
|
|
c620d6 |
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
|
|
|
c620d6 |
import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream;
|
|
|
c620d6 |
@@ -586,10 +584,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
|
|
|
c620d6 |
}
|
|
|
c620d6 |
|
|
|
c620d6 |
if (BROTLI.equalsIgnoreCase(name)) {
|
|
|
c620d6 |
- if (!BrotliUtils.isBrotliCompressionAvailable()) {
|
|
|
c620d6 |
- throw new CompressorException("Brotli compression is not available." + YOU_NEED_BROTLI_DEC);
|
|
|
c620d6 |
- }
|
|
|
c620d6 |
- return new BrotliCompressorInputStream(in);
|
|
|
c620d6 |
+ throw new CompressorException("Brotli compression is not available in this build.");
|
|
|
c620d6 |
}
|
|
|
c620d6 |
|
|
|
c620d6 |
if (XZ.equalsIgnoreCase(name)) {
|
|
|
c620d6 |
--
|
|
|
c620d6 |
2.14.3
|
|
|
c620d6 |
|