echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge of 'bd4c9889786a280f8797cbdc6ca9cddb8c7260a2'

Browse Source 
and 'fe4b2b6942b6c0dbe1efda4e2fa555289e74cbef'
This commit is contained in:
zzz
2017-03-03 14:00:47 +00:00
parent 61e4e2a052 f7cdf221eb
commit 5f96067c22
11 changed files with 147 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/src/net/i2p/client/naming/HostTxtEntry.java
View File

@ -396,6 +396,8 @@ public class HostTxtEntry {
throw new IllegalStateException();
props.setProperty(PROP_NAME, name);
props.setProperty(PROP_DEST, dest);
if (!props.containsKey(PROP_DATE))
props.setProperty(PROP_DATE, Long.toString(System.currentTimeMillis() / 1000));
StringWriter buf = new StringWriter(1024);
try {
writeProps(buf);
@ -418,6 +420,8 @@ public class HostTxtEntry {
throw new IllegalStateException();
if (props.containsKey(sigprop))
throw new IllegalStateException();
if (!props.containsKey(PROP_DATE))
props.setProperty(PROP_DATE, Long.toString(System.currentTimeMillis() / 1000));
StringWriter buf = new StringWriter(1024);
buf.append(name);
buf.append(KV_SEPARATOR);

3
core/java/src/net/i2p/util/SystemVersion.java
View File

@ -20,6 +20,9 @@ public abstract class SystemVersion {
* @since 0.9.28
*/
public static final String DAEMON_USER = "i2psvc";
/*
* @since 0.9.29
*/
public static final String GENTOO_USER = "i2p";
private static final boolean _isWin = System.getProperty("os.name").startsWith("Win");