src/java.logging/share/classes/java/util/logging/FileHandler.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -614,83 +614,101 @@
      * @param unique a unique number to resolve conflicts
      * @return the generated File
      * @throws IOException
      */
     private File generate(String pattern, int generation, int unique)
-            throws IOException {
-        File file = null;
-        String word = "";
-        int ix = 0;
+            throws IOException
+    {
+        return generate(pattern, count, generation, unique);
+    }
+
+    // The static method here is provided for whitebox testing of the algorithm.
+    static File generate(String pat, int count, int generation, int unique)
+            throws IOException
+    {
+        Path path = Paths.get(pat);
+        Path result = null;
         boolean sawg = false;
         boolean sawu = false;
+        StringBuilder word = new StringBuilder();
+        Path prev = null;
+        for (Path elem : path) {
+            if (prev != null) {
+                prev = prev.resolveSibling(word.toString());
+                if (result == null) result = prev;
+                else result = result.resolve(prev);
+            }
+            String pattern = elem.toString();
+            int ix = 0;
+            word.setLength(0);
         while (ix < pattern.length()) {
             char ch = pattern.charAt(ix);
             ix++;
             char ch2 = 0;
             if (ix < pattern.length()) {
                 ch2 = Character.toLowerCase(pattern.charAt(ix));
             }
-            if (ch == '/') {
-                if (file == null) {
-                    file = new File(word);
-                } else {
-                    file = new File(file, word);
-                }
-                word = "";
-                continue;
-            } else  if (ch == '%') {
+                if (ch == '%') {
                 if (ch2 == 't') {
                     String tmpDir = System.getProperty("java.io.tmpdir");
                     if (tmpDir == null) {
                         tmpDir = System.getProperty("user.home");
                     }
-                    file = new File(tmpDir);
+                        result = Paths.get(tmpDir);
                     ix++;
-                    word = "";
+                        word.setLength(0);
                     continue;
                 } else if (ch2 == 'h') {
-                    file = new File(System.getProperty("user.home"));
+                        result = Paths.get(System.getProperty("user.home"));
                     if (jdk.internal.misc.VM.isSetUID()) {
                         // Ok, we are in a set UID program.  For safety's sake
                         // we disallow attempts to open files relative to %h.
                         throw new IOException("can't use %h in set UID program");
                     }
                     ix++;
-                    word = "";
+                        word.setLength(0);
                     continue;
                 } else if (ch2 == 'g') {
-                    word = word + generation;
+                        word = word.append(generation);
                     sawg = true;
                     ix++;
                     continue;
                 } else if (ch2 == 'u') {
-                    word = word + unique;
+                        word = word.append(unique);
                     sawu = true;
                     ix++;
                     continue;
                 } else if (ch2 == '%') {
-                    word = word + "%";
+                        word = word.append('%');
                     ix++;
                     continue;
                 }
             }
-            word = word + ch;
+                word = word.append(ch);
         }
+            prev = elem;
+        }
+
         if (count > 1 && !sawg) {
-            word = word + "." + generation;
+            word = word.append('.').append(generation);
         }
         if (unique > 0 && !sawu) {
-            word = word + "." + unique;
+            word = word.append('.').append(unique);
         }
         if (word.length() > 0) {
-            if (file == null) {
-                file = new File(word);
-            } else {
-                file = new File(file, word);
+            String n = word.toString();
+            Path p = prev == null ? Paths.get(n) : prev.resolveSibling(n);
+            result = result == null ? p : result.resolve(p);
+        } else if (result == null) {
+            result = Paths.get("");
             }
+
+        if (path.getRoot() == null) {
+            return result.toFile();
+        } else {
+            return path.getRoot().resolve(result).toFile();
         }
-        return file;
     }
 
     /**
      * Rotate the set of output files
      */