wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 864339 - Part 2: Replace GeckoJarReader EmptyStackException with an empty() check. r=wesj

Browse Source
This commit is contained in:
Chris Peterson 2013-04-23 16:00:44 -07:00
parent 081d555a74
commit 0718f3703d
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mobile/android/base/util/GeckoJarReader.java
View File

@ -16,7 +16,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.EmptyStackException;
import java.util.Stack;
/* Reads out of a multiple level deep jar file such as
@ -99,30 +98,25 @@ public final class GeckoJarReader {
return new NativeZip(fileUrl.getPath());
}
private static InputStream getStream(NativeZip zip, Stack<String> jarUrls) throws IOException {
private static InputStream getStream(NativeZip zip, Stack<String> jarUrls) {
InputStream inputStream = null;
try {
// loop through children jar files until we reach the innermost one
while (jarUrls.peek() != null) {
String fileName = jarUrls.pop();
if (inputStream != null) {
// intermediate NativeZips and InputStreams will be garbage collected.
zip = new NativeZip(inputStream);
}
// loop through children jar files until we reach the innermost one
while (!jarUrls.empty()) {
String fileName = jarUrls.pop();
inputStream = zip.getInputStream(fileName);
if (inputStream == null) {
Log.d(LOGTAG, "No Entry for " + fileName);
return null;
}
// if there is nothing else on the stack, this will throw and break us out of the loop
jarUrls.peek();
if (inputStream != null) {
// intermediate NativeZips and InputStreams will be garbage collected.
zip = new NativeZip(inputStream);
}
inputStream = zip.getInputStream(fileName);
if (inputStream == null) {
Log.d(LOGTAG, "No Entry for " + fileName);
return null;
}
} catch (EmptyStackException ex) {
Log.d(LOGTAG, "Jar reader reached end of stack");
}
return inputStream;
}