Merge branch 'v5-dev' of github.com:looly/hutool into v5-dev

This commit is contained in:
Looly 2019-10-20 22:19:23 +08:00
commit 78472ee493

View File

@ -4,8 +4,9 @@ import java.io.ByteArrayInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.zip.DeflaterInputStream;
import java.util.zip.GZIPInputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
import cn.hutool.core.util.StrUtil;
@ -103,9 +104,9 @@ public class HttpInputStream extends InputStream {
// 在类似于Head等方法中无body返回此时GZIPInputStream构造会出现错误在此忽略此错误读取普通数据
// ignore
}
} else if (response.isDeflate() && false == (this.in instanceof DeflaterInputStream)) {
} else if (response.isDeflate() && false == (this.in instanceof InflaterInputStream)) {
// Accept-Encoding: defalte
this.in = new DeflaterInputStream(this.in);
this.in = new InflaterInputStream(this.in, new Inflater(true));
}
}
}