Merge pull request #1408 from theathlete3141/#1395

#1395 - fix delay between the first active user(s) and the first request(s) in Karate-Gatling
karatelabs · Dec 21, 2020 · b716ca0 · b716ca0
2 parents 510afff + 38de2ab
commit b716ca0
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/karate-core/src/main/java/com/intuit/karate/resource/ResourceUtils.java b/karate-core/src/main/java/com/intuit/karate/resource/ResourceUtils.java
@@ -90,26 +90,29 @@ public static List<Feature> findFeatureFiles(File workingDir, List<String> paths
         return features;
     }
 
+    private static final ScanResult scanResult = new ClassGraph().acceptPaths("/").scan();
+
     public static Resource getResource(File workingDir, String path) {
         if (path.startsWith("classpath:")) {
             path = removePrefix(path);
             File file = classPathToFile(path);
             if (file != null) {
                 return new FileResource(file, true, path);
             }
-            List<Resource> resources = new ArrayList();
-            try (ScanResult scanResult = new ClassGraph().acceptPaths("/").scan()) {
-                ResourceList rl = scanResult.getResourcesWithPath(removePrefix(path));
-                rl.forEachByteArrayIgnoringIOException((res, bytes) -> {
-                    URI uri = res.getURI();
-                    if ("file".equals(uri.getScheme())) {
-                        File found = Paths.get(uri).toFile();
-                        resources.add(new FileResource(found, true, res.getPath()));
-                    } else {
-                        resources.add(new JarResource(bytes, res.getPath()));
-                    }
-                });
+            List<Resource> resources = new ArrayList<>();
+            ResourceList rl = scanResult.getResourcesWithPath(path);
+            if (rl == null) {
+                rl = ResourceList.emptyList();
             }
+            rl.forEachByteArrayIgnoringIOException((res, bytes) -> {
+                URI uri = res.getURI();
+                if ("file".equals(uri.getScheme())) {
+                    File found = Paths.get(uri).toFile();
+                    resources.add(new FileResource(found, true, res.getPath()));
+                } else {
+                    resources.add(new JarResource(bytes, res.getPath()));
+                }
+            });
             if (resources.isEmpty()) {
                 throw new RuntimeException("not found: " + path);
             }