Changeset a5f3220


Ignore:
Timestamp:
Jun 27, 2013 7:23:54 PM (7 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
003dc378
Parents:
78a25f0 (diff), a5df6d4 (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 '6844f955ddd2febe54ce677ef19309712f55113c'

and '8611baad56e8e18941721b156256783ba996a3cd'

File:
1 edited

Legend:

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

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