hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1920 from SiboVG/issue-1919

Browse Source 
Generalize error-catching of motor file loading
This commit is contained in:
Joe Pfeiffer 2022-12-24 11:02:14 -07:00 committed by GitHub
commit 32583eb9d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java
View File

@ -44,7 +44,7 @@ public class ZipFileMotorLoader implements MotorLoader {
@Override @Override
public List<ThrustCurveMotor.Builder> load(InputStream stream, String filename) throws IOException { public List<ThrustCurveMotor.Builder> load(InputStream stream, String filename) throws IOException, IllegalArgumentException {
List<ThrustCurveMotor.Builder> motors = new ArrayList<>(); List<ThrustCurveMotor.Builder> motors = new ArrayList<>();
ZipInputStream is = new ZipInputStream(stream); ZipInputStream is = new ZipInputStream(stream);

10
swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java
View File

@ -127,8 +127,8 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
new Pair<String,InputStream>( new Pair<String,InputStream>(
file.getName(), file.getName(),
new BufferedInputStream(new FileInputStream(file)))); new BufferedInputStream(new FileInputStream(file))));
} catch (IOException e) { } catch (Exception e) {
log.warn("IOException while reading " + file + ": " + e, e); log.warn("Exception while reading " + file + ": " + e, e);
} }
} }
@ -158,8 +158,8 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
dialog.setVisible(true); dialog.setVisible(true);
} }
f.getV().close(); f.getV().close();
} catch (IOException e) { } catch (Exception e) {
log.warn("IOException while loading file " + f.getU() + ": " + e, e); log.warn("Exception while loading file " + f.getU() + ": " + e, e);
try { try {
f.getV().close(); f.getV().close();
} catch (IOException e1) { } catch (IOException e1) {
@ -178,7 +178,7 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
FileIterator iterator; FileIterator iterator;
try { try {
iterator = new DirectoryIterator(file, fileFilter, true); iterator = new DirectoryIterator(file, fileFilter, true);
} catch (IOException e) { } catch (Exception e) {
log.warn("Unable to read directory " + file + ": " + e, e); log.warn("Unable to read directory " + file + ": " + e, e);
return; return;
} }