Changeset 7094489


Ignore:
Timestamp:
Oct 1, 2009 6:19:02 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
0d262d2
Parents:
2dd650d
Message:

fix OCMOSJ SKM NPE

Location:
router/java/src/net/i2p/router/message
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/message/GarlicMessageBuilder.java

    r2dd650d r7094489  
    103103     * @param wrappedKey output parameter that will be filled with the sessionKey used
    104104     * @param wrappedTags output parameter that will be filled with the sessionTags used
     105     * @param skm non-null
    105106     */
    106107    public static GarlicMessage buildMessage(RouterContext ctx, GarlicConfig config, SessionKey wrappedKey, Set<SessionTag> wrappedTags,
     
    123124     * @param wrappedTags output parameter that will be filled with the sessionTags used
    124125     * @param numTagsToDeliver only if the estimated available tags are below the threshold
     126     * @param skm non-null
    125127     */
    126128    private static GarlicMessage buildMessage(RouterContext ctx, GarlicConfig config, SessionKey wrappedKey, Set<SessionTag> wrappedTags,
  • router/java/src/net/i2p/router/message/OutboundClientMessageJobHelper.java

    r2dd650d r7094489  
    1111import java.util.Set;
    1212
     13import net.i2p.crypto.SessionKeyManager;
    1314import net.i2p.data.Certificate;
    1415import net.i2p.data.Destination;
     
    7677        if (config == null)
    7778            return null;
     79        SessionKeyManager skm = ctx.clientManager().getClientSessionKeyManager(from);
     80        if (skm == null)
     81            return null;
    7882        GarlicMessage msg = GarlicMessageBuilder.buildMessage(ctx, config, wrappedKey, wrappedTags,
    79                                                               ctx.clientManager().getClientSessionKeyManager(from));
     83                                                              skm);
    8084        return msg;
    8185    }
Note: See TracChangeset for help on using the changeset viewer.