Changeset 003dc378


Ignore:
Timestamp:
Jun 28, 2013 12:06:22 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
46d13d2
Parents:
a5f3220 (diff), 847a441 (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:

merge of 'bde6736c06f94ff24285aeff0a64ec7dc3a52a4b'

and 'f4b18bbf4329a48a182a57db594a58d4a32a9da7'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • core/java/src/net/i2p/data/RouterAddress.java

    ra5f3220 r003dc378  
    216216        //_expiration = DataHelper.readDate(in);
    217217        DataHelper.readDate(in);
     218        _transportStyle = DataHelper.readString(in);
    218219        // reduce Object proliferation
    219         _transportStyle = DataHelper.readString(in).intern();
     220        if (_transportStyle.equals("SSU"))
     221            _transportStyle = "SSU";
     222        else if (_transportStyle.equals("NTCP"))
     223            _transportStyle = "NTCP";
    220224        DataHelper.readProperties(in, _options);
    221225    }
Note: See TracChangeset for help on using the changeset viewer.