[jboss-cvs] JBoss Messaging SVN: r7386 - in trunk/src/main/org/jboss/messaging/core: management/impl and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2009-06-18 04:45:06 -0400 (Thu, 18 Jun 2009)
New Revision: 7386

Modified:
   trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java
   trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java
   trunk/src/main/org/jboss/messaging/core/messagecounter/impl/MessageCounterHelper.java
Log:
* inlined DateFormat use to avoid synchronization issues

Modified: trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java	2009-06-18 05:53:17 UTC (rev 7385)
+++ trunk/src/main/org/jboss/messaging/core/management/MessageCounterInfo.java	2009-06-18 08:45:06 UTC (rev 7386)
@@ -40,8 +40,6 @@
    // Constants -----------------------------------------------------
 
    private static final Logger log = Logger.getLogger(MessageCounterInfo.class);
-
-   private static final DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM);
    
    // Attributes ----------------------------------------------------
 
@@ -67,10 +65,12 @@
 
    public static String toJSon(MessageCounter counter) throws Exception
    {
+      DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM);
+
       JSONObject json = new JSONObject(counter);
-      String lastAddTimestamp = DATE_FORMAT.format(new Date(counter.getLastAddedMessageTime()));
+      String lastAddTimestamp = dateFormat.format(new Date(counter.getLastAddedMessageTime()));
       json.put("lastAddTimestamp", lastAddTimestamp);
-      String updateTimestamp = DATE_FORMAT.format(new Date(counter.getLastUpdate()));
+      String updateTimestamp = dateFormat.format(new Date(counter.getLastUpdate()));
       json.put("updateTimestamp", updateTimestamp);
       
       return json.toString();

Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java	2009-06-18 05:53:17 UTC (rev 7385)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControlImpl.java	2009-06-18 08:45:06 UTC (rev 7386)
@@ -73,8 +73,6 @@
 
    private static final Logger log = Logger.getLogger(MessagingServerControlImpl.class);
 
-   private static DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM);
-
    // Attributes ----------------------------------------------------
 
    private final PostOffice postOffice;
@@ -340,6 +338,9 @@
 
    public String[] listPreparedTransactions()
    {
+      DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM);
+
+
       Map<Xid, Long> xids = resourceManager.getPreparedTransactionsWithCreationTime();
       ArrayList<Entry<Xid, Long>> xidsSortedByCreationTime = new ArrayList<Map.Entry<Xid, Long>>(xids.entrySet());
       Collections.sort(xidsSortedByCreationTime, new Comparator<Entry<Xid, Long>>()
@@ -356,7 +357,7 @@
       {
          Date creation = new Date(entry.getValue());
          Xid xid = entry.getKey();
-         s[i++] = DATE_FORMAT.format(creation) + " base64: " + XidImpl.toBase64String(xid) + " " + xid.toString();
+         s[i++] = dateFormat.format(creation) + " base64: " + XidImpl.toBase64String(xid) + " " + xid.toString();
       }
       return s;
    }

Modified: trunk/src/main/org/jboss/messaging/core/messagecounter/impl/MessageCounterHelper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/messagecounter/impl/MessageCounterHelper.java	2009-06-18 05:53:17 UTC (rev 7385)
+++ trunk/src/main/org/jboss/messaging/core/messagecounter/impl/MessageCounterHelper.java	2009-06-18 08:45:06 UTC (rev 7386)
@@ -42,8 +42,6 @@
 {
    // Constants -----------------------------------------------------
 
-   private static DateFormat DATE_FORMAT = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM);
-
    // Attributes ----------------------------------------------------
 
    // Static --------------------------------------------------------
@@ -212,7 +210,7 @@
    {
       if (time > 0)
       {
-         return DATE_FORMAT.format(new Date(time));
+         return DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM).format(new Date(time));
       }
       else
       {