diff options
| author | Paul Duffin <paulduffin@google.com> | 2018-07-10 11:14:07 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2018-07-11 14:55:58 +0100 |
| commit | 833a4f0806fc1e2849d1b091d203d44821cad957 (patch) | |
| tree | f51f80c30214e5cf676d5b3c294ca5bfc398ed04 /annotations/generate_annotated_java_files.py | |
| parent | 8d303a63577f7043c0aba509aad5b832568e69dc (diff) | |
Remove unnecessary directory fallback mechanism
This mechanism was added under b/22527772 when ClassPathURLStreamHandler
used the StrictJarFile.findEntry(String) method but since then it has
been updated to use standard JarFile.getEntry(String) which already has
its own directory fallback mechanism making the logic in
ClassPathURLStreamHandler useless.
There are currently three places where a directory fallback is used in
Zip code on Android.
* ZipFile.getEntry(String)
- that is upstream behavior and is not going to be changed by us.
* ClassPathURLStreamHandler.findEntryWithDirectoryFallback()
- that is being removed by this change as it calls into
ZipFile.getEntry() which already does directory fallback so is
pointless to do it again.
* ZipFile.getInputStream(ZipEntry)
- that is an Android patch that could be dropped in future once we
integrate changes from either 8u144 or 9.
This was found while verifying ZipFile changes against upstream OpenJDK
8u121-b13.
Bug: 22527772
Bug: 111293098
Test: flash, CtsLibcoreTestCases
Change-Id: I861d598fccabd6d16b3d3ab159e8f354ce880879
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions