Changeset fadc624 for apps/ministreaming


Ignore:
Timestamp:
Mar 31, 2015 1:18:11 PM (5 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
20197fc
Parents:
22c4149
Message:

API: Fix some client-side APIs to honor defaults in Properties;
add javadocs to specify where we do and don't (ticket #1491)

Location:
apps/ministreaming/java/src/net/i2p/client/streaming
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManager.java

    r22c4149 rfadc624  
    7474    /**
    7575     *  Create a modified copy of the current options, to be used in a setDefaultOptions() call.
     76     *
     77     *  As of 0.9.19, defaults in opts are honored.
     78     *
    7679     *  @param opts The new options, may be null
    7780     */
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java

    r22c4149 rfadc624  
    5050     *
    5151     * Blocks for a long time while the router builds tunnels.
     52     * The nonblocking createDisconnectedManager() is preferred.
    5253     *
    5354     * @return the newly created socket manager, or null if there were errors
     
    6263     *
    6364     * Blocks for a long time while the router builds tunnels.
     65     * The nonblocking createDisconnectedManager() is preferred.
    6466     *
    6567     * @param opts Streaming and I2CP options, may be null
     
    7577     *
    7678     * Blocks for a long time while the router builds tunnels.
     79     * The nonblocking createDisconnectedManager() is preferred.
    7780     *
    7881     * @param host I2CP host null to use default, ignored if in router context
     
    8992     *
    9093     * Blocks for a long time while the router builds tunnels.
     94     * The nonblocking createDisconnectedManager() is preferred.
    9195     *
    9296     * @param i2cpHost I2CP host null to use default, ignored if in router context
     
    116120     *
    117121     * Blocks for a long time while the router builds tunnels.
     122     * The nonblocking createDisconnectedManager() is preferred.
    118123     *
    119124     * @param myPrivateKeyStream private key stream, format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
     
    130135     *
    131136     * Blocks for a long time while the router builds tunnels.
     137     * The nonblocking createDisconnectedManager() is preferred.
    132138     *
    133139     * @param myPrivateKeyStream private key stream, format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
     
    146152     *
    147153     * Blocks for a long time while the router builds tunnels.
     154     * The nonblocking createDisconnectedManager() is preferred.
    148155     *
    149156     * @param myPrivateKeyStream private key stream, format is specified in {@link net.i2p.data.PrivateKeyFile PrivateKeyFile}
     
    221228        for (Map.Entry<Object, Object> e : syscopy.entrySet()) {
    222229            String name = (String) e.getKey();
    223             if (!opts.containsKey(name))
     230            if (opts.getProperty(name) != null)
    224231                opts.setProperty(name, (String) e.getValue());
    225232        }
    226233        // as of 0.8.1 (I2CP default is BestEffort)
    227         if (!opts.containsKey(I2PClient.PROP_RELIABILITY))
     234        if (opts.getProperty(I2PClient.PROP_RELIABILITY) == null)
    228235            opts.setProperty(I2PClient.PROP_RELIABILITY, I2PClient.PROP_RELIABILITY_NONE);
    229236
Note: See TracChangeset for help on using the changeset viewer.