echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* RouterInfo: Exit 1 on error in main()

Browse Source
This commit is contained in:
zzz
2012-10-09 10:14:56 +00:00
parent 762e96b8a6
commit 8ed280ebf4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/src/net/i2p/data/RouterInfo.java
View File

@ -637,7 +637,8 @@ public class RouterInfo extends DatabaseEntry {
}
/**
* Print out routerinfos from files specified on the command line
* Print out routerinfos from files specified on the command line.
* Exits 1 if any RI is invalid, fails signature, etc.
* @since 0.8
*/
public static void main(String[] args) {
@ -645,23 +646,29 @@ public class RouterInfo extends DatabaseEntry {
System.err.println("Usage: RouterInfo file ...");
System.exit(1);
}
boolean fail = false;
for (int i = 0; i < args.length; i++) {
RouterInfo ri = new RouterInfo();
InputStream is = null;
try {
is = new java.io.FileInputStream(args[i]);
ri.readBytes(is);
if (ri.isValid())
if (ri.isValid()) {
System.out.println(ri.toString());
else
} else {
System.err.println("Router info " + args[i] + " is invalid");
fail = true;
}
} catch (Exception e) {
System.err.println("Error reading " + args[i] + ": " + e);
fail = true;
} finally {
if (is != null) {
try { is.close(); } catch (IOException ioe) {}
}
}
}
if (fail)
System.exit(1);
}
}