forked from I2P_Developers/i2p.i2p
propagate from branch 'i2p.i2p.zzz.test2' (head 8fa44268a1dd2b7baaf01806e6994281ab031870)
to branch 'i2p.i2p' (head 44afdaa15ce8a95c112c7d58a5908f401c1a0145)
This commit is contained in:
@@ -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.");
|
||||
}
|
||||
|
@@ -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;
|
||||
}
|
||||
|
||||
|
@@ -205,7 +205,7 @@ public class NamingServiceBean extends AddressbookBean
|
||||
|
||||
message = generateLoadMessage();
|
||||
}
|
||||
catch (Exception e) {
|
||||
catch (RuntimeException e) {
|
||||
warn(e);
|
||||
}
|
||||
if( message.length() > 0 )
|
||||
|
Reference in New Issue
Block a user