Changeset 615ba94 for apps/ministreaming


Ignore:
Timestamp:
Nov 25, 2013 10:36:27 PM (7 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
e77409e
Parents:
ce0596d (diff), c6f2d49 (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' (head d12a1fd746cd9314de5de5e1000c02cf4c59100d)

to branch 'i2p.i2p.str4d.cleanup' (head e20c143dd50a9c802999068a95e12198b07e4c36)

File:
1 edited

Legend:

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

    rce0596d r615ba94  
    66import java.io.InputStream;
    77import java.lang.reflect.Constructor;
    8 import java.util.Iterator;
    98import java.util.Map;
    109import java.util.Properties;
     
    203202            opts = new Properties();
    204203        Properties syscopy = (Properties) System.getProperties().clone();
    205         for (Map.Entry e : syscopy.entrySet()) {
     204        for (Map.Entry<Object, Object> e : syscopy.entrySet()) {
    206205            String name = (String) e.getKey();
    207206            if (!opts.containsKey(name))
Note: See TracChangeset for help on using the changeset viewer.