--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFC.java	Fri Jun 07 21:35:26 2019 -0700
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/jfc/JFC.java	Sun Jun 09 11:28:13 2019 +0200
@@ -127,7 +127,11 @@
 
     public static String nameFromPath(Path file) throws IOException {
         String f = nullSafeFileName(file);
-        return f.substring(0, f.length() - JFCParser.FILE_EXTENSION.length());
+        if (f.endsWith(JFCParser.FILE_EXTENSION)) {
+            return f.substring(0, f.length() - JFCParser.FILE_EXTENSION.length());
+        } else  {
+            return f;
+        }
     }
 
     // Invoked by DCmdStart