From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 12 Sep 2012 07:14:08 +0000 (+0200)
Subject: Merge remote-tracking branch 'beak/next' into next
X-Git-Tag: 0.8.3^2~39
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=d1e011bc62bede509d8482dfeea950823b974413;hp=a326f3daa87f842d44f198bb456a5ece95b2d725

Merge remote-tracking branch 'beak/next' into next
---

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 294ff0d..9e1e6c6 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -2355,7 +2355,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
 			return uri;
 		} catch (MalformedURLException mue1) {
-			logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString, mue1));
+			logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString), mue1);
 			return null;
 		}
 	}
diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
index 84badf2..f6bc05d 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
@@ -66,7 +66,9 @@ public class GetTimesAjaxPage extends JsonPage {
 				Time time = getTime(post.getTime());
 				postTime.put("timeText", time.getText());
 				postTime.put("refreshTime", time.getRefresh() / Time.SECOND);
-				postTime.put("tooltip", dateFormat.format(new Date(post.getTime())));
+				synchronized (dateFormat) {
+					postTime.put("tooltip", dateFormat.format(new Date(post.getTime())));
+				}
 				postTimes.put(id, postTime);
 			}
 		}
@@ -83,7 +85,9 @@ public class GetTimesAjaxPage extends JsonPage {
 				Time time = getTime(reply.getTime());
 				replyTime.put("timeText", time.getText());
 				replyTime.put("refreshTime", time.getRefresh() / Time.SECOND);
-				replyTime.put("tooltip", dateFormat.format(new Date(reply.getTime())));
+				synchronized (dateFormat) {
+					replyTime.put("tooltip", dateFormat.format(new Date(reply.getTime())));
+				}
 				replyTimes.put(id, replyTime);
 			}
 		}