svn commit: r1784148 - /jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java

[se...@apache.org]

Author: sebb
Date: Thu Feb 23 15:03:42 2017
New Revision: 1784148

URL: http://svn.apache.org/viewvc?rev=1784148&view=rev
Log:
testFindAllClassesInJar(org.apache.jorphan.reflect.TestClassFinder) can fail on Windows
Bugzilla Id: 60771

Modified:
    jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java

Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=1784148&r1=1784147&r2=1784148&view=diff
==============================================================================
--- jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java Thu Feb 23 15:03:42 2017
@@ -30,6 +30,7 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.TreeSet;
@@ -342,6 +343,7 @@ public final class ClassFinder {
     /**
      * Fix a path:
      * - replace "." by current directory
+     * - upcase the first character if it appears to be a drive letter
      * - trim any trailing spaces
      * - replace \ by /
      * - replace // by /
@@ -354,6 +356,9 @@ public final class ClassFinder {
         if (path.equals(".")) { // $NON-NLS-1$
             return System.getProperty("user.dir"); // $NON-NLS-1$
         }
+        if (path.length() > 3 && path.matches("[a-z]:\\.*")) { // lower-case drive letter?
+            path = path.substring(0, 1).toUpperCase(Locale.ROOT) + path.substring(1);
+        }
         path = path.trim().replace('\\', '/'); // $NON-NLS-1$ // $NON-NLS-2$
         path = JOrphanUtils.substitute(path, "//", "/"); // $NON-NLS-1$// $NON-NLS-2$