eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 21:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix to ignore META-INF and NullPointerException on external siphon

Browse Source
This commit is contained in:
benfry
2003-10-28 15:22:38 +00:00
parent 3498a9d5c9
commit 514aebdb95
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/PdeCompiler.java
View File

@@ -334,6 +334,7 @@ public class PdeCompiler implements PdeMessageConsumer {
}
} catch (IOException e) {
System.err.println("Error in file " + pieces[i]);
e.printStackTrace();
}
} else {
File dir = new File(pieces[i]);
@@ -385,7 +386,7 @@ public class PdeCompiler implements PdeMessageConsumer {
for (int i = 0; i < pieces.length; i++) {
if (pieces[i].length() == 0) continue;
System.out.println("checking piece " + pieces[i]);
//System.out.println("checking piece " + pieces[i]);
// is it a jar file or directory?
if (pieces[i].toLowerCase().endsWith(".jar") ||
@@ -396,13 +397,15 @@ public class PdeCompiler implements PdeMessageConsumer {
while (entries.hasMoreElements()) {
ZipEntry entry = (ZipEntry) entries.nextElement();
if (entry.isDirectory()) {
String name = entry.getName();
if (name.equals("META-INF/")) continue;
//String name = entry.getName();
//if (name.indexOf("META-INF/") == 0) continue;
// actually 'continue's for all dir entries
} else {
//zos.putNextEntry(entry);
ZipEntry entree = new ZipEntry(entry.getName());
String name = entry.getName();
if (name.indexOf("META-INF") == 0) continue;
ZipEntry entree = new ZipEntry(name);
zos.putNextEntry(entree);
byte buffer[] = new byte[(int) entry.getSize()];
InputStream is = file.getInputStream(entry);
@@ -427,6 +430,7 @@ public class PdeCompiler implements PdeMessageConsumer {
}
} catch (IOException e) {
System.err.println("Error in file " + pieces[i]);
e.printStackTrace();
}
} else { // not a .jar or .zip, prolly a directory
File dir = new File(pieces[i]);