From f5ae9c23fea69d83064d33360d3f0b03fcd5aaa6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 14 Nov 2015 02:50:08 +0000
Subject: [PATCH] fix installer tools compile
---
.../i2p/router/networkdb/kademlia/BundleRouterInfos.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java b/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java
index ac405f0ee5..cab5991d33 100644
--- a/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java
+++ b/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java
@@ -24,6 +24,7 @@ import java.util.Properties;
import gnu.getopt.Getopt;
import net.i2p.I2PAppContext;
+import net.i2p.data.DataFormatException;
import net.i2p.data.Hash;
import net.i2p.data.router.RouterAddress;
import net.i2p.data.router.RouterInfo;
@@ -109,7 +110,9 @@ public class BundleRouterInfos {
RouterInfo ri = new RouterInfo();
ri.readBytes(fis, true); // true = verify sig on read
me = ri.getIdentity().getHash();
- } catch (RuntimeException e) {
+ } catch (IOException e) {
+ //System.out.println("Can't determine our identity");
+ } catch (DataFormatException e) {
//System.out.println("Can't determine our identity");
} finally {
if (fis != null) try { fis.close(); } catch (IOException ioe) {}
@@ -209,7 +212,9 @@ public class BundleRouterInfos {
copied++;
else
System.out.println("Failed copy of " + file + " to " + toDir);
- } catch (RuntimeException e) {
+ } catch (IOException e) {
+ System.out.println("Skipping bad " + file);
+ } catch (DataFormatException e) {
System.out.println("Skipping bad " + file);
} finally {
if (fis != null) try { fis.close(); } catch (IOException ioe) {}
--
GitLab