merge of 'bde6736c06f94ff24285aeff0a64ec7dc3a52a4b'

     and 'f4b18bbf4329a48a182a57db594a58d4a32a9da7'

core/java/src/net/i2p/data/RouterAddress.java

@@ -215,8 +215,12 @@ public class RouterAddress extends DataStructureImpl {
         _cost = (int) DataHelper.readLong(in, 1);
         //_expiration = DataHelper.readDate(in);
         DataHelper.readDate(in);
+        _transportStyle = DataHelper.readString(in);
         // reduce Object proliferation
-        _transportStyle = DataHelper.readString(in).intern();
+        if (_transportStyle.equals("SSU"))
+            _transportStyle = "SSU";
+        else if (_transportStyle.equals("NTCP"))
+            _transportStyle = "NTCP";
         DataHelper.readProperties(in, _options);
     }