Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Jun 25, 2018 · ec4505e · ec4505e
2 parents a92f487 + a620b8d
commit ec4505e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.../evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java b/.../evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java
@@ -29,6 +29,9 @@
 import org.apache.wicket.util.file.Files;
 
 import java.io.*;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Collection;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -99,7 +102,8 @@ protected File initFile() {
         }
 
         String suffix = isUseZip() ? "zip" : "xml";
-        String fileName = "ExportedData_" + getType().getSimpleName() + "_" + System.currentTimeMillis() + "." + suffix;
+        String currentTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy_MM_dd_HH_m_s"));
+        String fileName = "ExportedData_" + getType().getSimpleName() + "_" + currentTime + "." + suffix;
         File file = new File(folder, fileName);
 
         Writer writer = null;