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

propagate from branch 'i2p.i2p.zzz.test2' (head 8fa44268a1dd2b7baaf01806e6994281ab031870)

Browse Source 
to branch 'i2p.i2p' (head 44afdaa15ce8a95c112c7d58a5908f401c1a0145)
This commit is contained in:
zzz
2015-11-22 16:00:16 +00:00
parent 9a9832cb77 ce96234fdb
commit 1215a70aab
148 changed files with 1130 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
View File

@@ -164,7 +164,7 @@ public class AddressbookBean extends BaseBean
message = generateLoadMessage();
}
catch (Exception e) {
catch (IOException e) {
warn(e);
} finally {
if (fis != null)
@@ -316,7 +316,7 @@ public class AddressbookBean extends BaseBean
try {
save();
message += "<br>" + _t("Address book saved.");
} catch (Exception e) {
} catch (IOException e) {
warn(e);
message += "<br>" + _t("ERROR: Could not write addressbook file.");
}

6
apps/susidns/src/java/src/i2p/susi/dns/FormatDate.java
View File

@@ -2,9 +2,9 @@ package i2p.susi.dns;
import java.util.Date;
import java.text.DateFormat;
import java.util.TimeZone;
import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper;
/**
* Format a date in local time zone
@@ -17,9 +17,7 @@ public abstract class FormatDate
static {
DateFormat fmt = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM);
// the router sets the JVM time zone to UTC but saves the original here so we can get it
String systemTimeZone = I2PAppContext.getGlobalContext().getProperty("i2p.systemTimeZone");
if (systemTimeZone != null)
fmt.setTimeZone(TimeZone.getTimeZone(systemTimeZone));
fmt.setTimeZone(DataHelper.getSystemTimeZone(I2PAppContext.getGlobalContext()));
_dateFormat = fmt;
}

2
apps/susidns/src/java/src/i2p/susi/dns/NamingServiceBean.java
View File

@@ -205,7 +205,7 @@ public class NamingServiceBean extends AddressbookBean
message = generateLoadMessage();
}
catch (Exception e) {
catch (RuntimeException e) {
warn(e);
}
if( message.length() > 0 )