archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8203328: Rename EFS in java.util.zip internals to something meaningful

Browse source 
Reviewed-by: sherman
This commit is contained in:
Martin Buchholz 2018-05-23 10:34:18 -07:00
parent e1bffce5a3
commit 42f7e3f69e
13 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/java/util/zip/ZipInputStream.java
View file

@ -98,7 +98,7 @@ class ZipInputStream extends InflaterInputStream implements ZipConstants {
public ZipInputStream(InputStream in, Charset charset) {
super(new PushbackInputStream(in, 512), new Inflater(true), 512);
usesDefaultInflater = true;
if(in == null) {
if (in == null) {
throw new NullPointerException("in is null");
}
if (charset == null)
@ -283,7 +283,7 @@ class ZipInputStream extends InflaterInputStream implements ZipConstants {
if (get32(tmpbuf, 0) != LOCSIG) {
return null;
}
// get flag first, we need check EFS.
// get flag first, we need check USE_UTF8.
flag = get16(tmpbuf, LOCFLG);
// get the entry name and create the ZipEntry first
int len = get16(tmpbuf, LOCNAM);
@ -295,8 +295,8 @@ class ZipInputStream extends InflaterInputStream implements ZipConstants {
b = new byte[blen];
}
readFully(b, 0, len);
// Force to use UTF-8 if the EFS bit is ON, even the cs is NOT UTF-8
ZipEntry e = createZipEntry(((flag & EFS) != 0)
// Force to use UTF-8 if the USE_UTF8 bit is ON
ZipEntry e = createZipEntry(((flag & USE_UTF8) != 0)
? zc.toStringUTF8(b, len)
: zc.toString(b, len));
// now get the remaining fields for the entry