Changeset bfde521


Ignore:
Timestamp:
Jul 25, 2015 1:37:45 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d848a19
Parents:
fea6b8ae
Message:

NetDB: Fix NPE (ticket #1619)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • history.txt

    rfea6b8ae rbfde521  
     12015-07-25 zzz
     2 * i2psnark: Fix total_size in metadata message (ticket #1618)
     3 * NetDB: Fix NPE (ticket #1619)
     4
    152015-07-21 str4d
    26 * Core: Throw DFE in Certificate.create() instead of AIOOBE (ticket #1016)
  • router/java/src/net/i2p/router/RouterVersion.java

    rfea6b8ae rbfde521  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 18;
     21    public final static long BUILD = 19;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/networkdb/kademlia/ExploreJob.java

    rfea6b8ae rbfde521  
    7979     * @param peer the peer to send it to
    8080     *
    81      * @return a DatabaseLookupMessage or GarlicMessage
     81     * @return a DatabaseLookupMessage or GarlicMessage or null on error
    8282     */
    8383    @Override
     
    147147                msg.setReplySession(sess.key, sess.tag);
    148148            }
     149            // may be null
    149150            outMsg = MessageWrapper.wrap(getContext(), msg, peer);
    150151            if (_log.shouldLog(Log.DEBUG))
  • router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java

    rfea6b8ae rbfde521  
    446446
    447447        I2NPMessage msg = buildMessage(inTunnelId, inTunnel.getPeer(0), expiration, router);   
    448        
     448        if (msg == null) {
     449            getContext().jobQueue().addJob(new FailedJob(getContext(), router));
     450            return;
     451        }
     452
    449453        TunnelInfo outTunnel = getContext().tunnelManager().selectOutboundExploratoryTunnel(to);
    450454        if (outTunnel == null) {
     
    481485        //I2NPMessage msg = buildMessage(expiration);
    482486        I2NPMessage msg = buildMessage(null, router.getIdentity().getHash(), expiration, router);       
     487        if (msg == null) {
     488            getContext().jobQueue().addJob(new FailedJob(getContext(), router));
     489            return;
     490        }
    483491
    484492        if (_log.shouldLog(Log.DEBUG))
Note: See TracChangeset for help on using the changeset viewer.