Changeset 1215a70 for installer


Ignore:
Timestamp:
Nov 22, 2015 4:00:16 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
302ec77
Parents:
9a9832c (diff), ce96234 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p.zzz.test2' (head 8fa44268a1dd2b7baaf01806e6994281ab031870)

to branch 'i2p.i2p' (head 44afdaa15ce8a95c112c7d58a5908f401c1a0145)

Location:
installer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • installer/java/src/net/i2p/installer/Exec.java

    r9a9832c r1215a70  
    22
    33import java.io.File;
     4import java.io.IOException;
    45
    56/**
     
    2122            try { proc.exitValue(); } catch (Throwable t) { }
    2223            Runtime.getRuntime().halt(0);
    23 
    24         } catch (Exception e) {
     24        } catch (IOException e) {
     25            e.printStackTrace();
     26        } catch (RuntimeException e) {
    2527            e.printStackTrace();
    2628        }
  • installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java

    r9a9832c r1215a70  
    2525
    2626import net.i2p.I2PAppContext;
     27import net.i2p.data.DataFormatException;
    2728import net.i2p.data.Hash;
    2829import net.i2p.data.router.RouterAddress;
     
    110111            ri.readBytes(fis, true);  // true = verify sig on read
    111112            me = ri.getIdentity().getHash();
    112         } catch (Exception e) {
     113        } catch (IOException e) {
     114            //System.out.println("Can't determine our identity");
     115        } catch (DataFormatException e) {
    113116            //System.out.println("Can't determine our identity");
    114117        } finally {
     
    210213                else
    211214                    System.out.println("Failed copy of " + file + " to " + toDir);
    212             } catch (Exception e) {
     215            } catch (IOException e) {
     216                System.out.println("Skipping bad " + file);
     217            } catch (DataFormatException e) {
    213218                System.out.println("Skipping bad " + file);
    214219            } finally {
Note: See TracChangeset for help on using the changeset viewer.