svn commit: r1875419 - in /jackrabbit/oak/branches/1.10: ./ oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java

[re...@apache.org]

Author: reschke
Date: Thu Mar 19 12:24:00 2020
New Revision: 1875419

URL: http://svn.apache.org/viewvc?rev=1875419&view=rev
Log:
OAK-8760: ClusterViewDocument uses static instance of SimpleDateFormat (merged r1872485 into 1.10)

Modified:
    jackrabbit/oak/branches/1.10/   (props changed)
    jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java

Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1872485

Modified: jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java?rev=1875419&r1=1875418&r2=1875419&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java (original)
+++ jackrabbit/oak/branches/1.10/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewDocument.java Thu Mar 19 12:24:00 2020
@@ -18,8 +18,6 @@
  */
 package org.apache.jackrabbit.oak.plugins.document;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -30,6 +28,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
+import org.apache.jackrabbit.util.ISO8601;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -120,9 +119,6 @@ class ClusterViewDocument {
      **/
     private static final String CLUSTER_VIEW_HISTORY_KEY = "clusterViewHistory";
 
-    /** the format used when storing date+time **/
-    private static final DateFormat standardDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
-
     /** number of elements kept in the CLUSTERVIEW_HISTORY_KEY field **/
     static final int HISTORY_LIMIT = 10;
 
@@ -186,7 +182,7 @@ class ClusterViewDocument {
         updateOp.set(ACTIVE_KEY, setToCsv(activeIds));
         updateOp.set(RECOVERING_KEY, setToCsv(recoveringIds));
         updateOp.set(INACTIVE_KEY, setToCsv(inactiveIds));
-        updateOp.set(CREATED_KEY, standardDateFormat.format(now));
+        updateOp.set(CREATED_KEY, ISO8601.format(now));
         updateOp.set(CREATOR_KEY, (long)localClusterId);
         if (previousView != null) {
             Map<Object, String> previousHistory = previousView.getHistory();
@@ -304,7 +300,7 @@ class ClusterViewDocument {
         b.key(CREATOR_KEY);
         b.value(previousView.getCreatedBy());
         b.key(RETIRED_KEY);
-        b.value(String.valueOf(standardDateFormat.format(retireTime)));
+        b.value(String.valueOf(ISO8601.format(retireTime)));
         b.key(RETIRER_KEY);
         b.value(retiringClusterNodeId);
         b.key(ACTIVE_KEY);