From 9059de31e0e7819c82ddcf73bd56c5da5dff1058 Mon Sep 17 00:00:00 2001
From: Alfusainey Jallow <alf.jallow@gmail.com>
Date: Thu, 21 Apr 2016 18:08:34 +0000
Subject: [PATCH] fix call to method of static DateFormat

---
 .../jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
index 51c55db..3c14a59 100644
--- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
+++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/parser/MigrationOptions.java
@@ -28,7 +28,7 @@ public class MigrationOptions {
 
     private static final Logger log = LoggerFactory.getLogger(MigrationOptions.class);
 
-    private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
+    private final DateFormat dateFormat;
 
     private final boolean copyBinariesByReference;
 
@@ -51,6 +51,7 @@ public class MigrationOptions {
     private final boolean earlyShutdown;
 
     public MigrationOptions(MigrationCliArguments args) {
+        this.dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         this.copyBinariesByReference = !args.hasOption(OptionParserFactory.COPY_BINARIES);
         this.mmap = args.hasOption(OptionParserFactory.MMAP);
         if (args.hasOption(OptionParserFactory.CACHE_SIZE)) {
@@ -133,13 +134,13 @@ public class MigrationOptions {
         if (copyVersions == null) {
             log.info("copyVersions parameter set to false");
         } else {
-            log.info("copyVersions parameter set to {}", DATE_FORMAT.format(copyVersions.getTime()));
+            log.info("copyVersions parameter set to {}", dateFormat.format(copyVersions.getTime()));
         }
 
         if (copyOrphanedVersions == null) {
             log.info("copyOrphanedVersions parameter set to false");
         } else {
-            log.info("copyOrphanedVersions parameter set to {}", DATE_FORMAT.format(copyOrphanedVersions.getTime()));
+            log.info("copyOrphanedVersions parameter set to {}", dateFormat.format(copyOrphanedVersions.getTime()));
         }
 
         if (includePaths != null) {
@@ -170,7 +171,7 @@ public class MigrationOptions {
         }
     }
 
-    private static Calendar parseVersionCopyArgument(String string) {
+    private Calendar parseVersionCopyArgument(String string) {
         final Calendar calendar;
 
         if (Boolean.parseBoolean(string)) {
@@ -179,7 +180,7 @@ public class MigrationOptions {
         } else if (string != null && string.matches("^\\d{4}-\\d{2}-\\d{2}$")) {
             calendar = Calendar.getInstance();
             try {
-                calendar.setTime(DATE_FORMAT.parse(string));
+                calendar.setTime(dateFormat.parse(string));
             } catch (ParseException e) {
                 return null;
             }
-- 
1.9.1