[GR-30306] generate catalog should fail fast on unexpected parameters.

mttcr · Mar 26, 2021 · 539a922 · 539a922
1 parent 51689ee
commit 539a922
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/.../org.graalvm.component.installer/src/org/graalvm/component/installer/GenerateCatalog.java b/.../org.graalvm.component.installer/src/org/graalvm/component/installer/GenerateCatalog.java
@@ -248,10 +248,10 @@ public RuntimeException err(String messageKey, Object... args) {
             Path listFrom = Paths.get(env.optValue("l"));
             Files.walk(listFrom).filter((p) -> p.toString().endsWith(".jar")).forEach(
                             (p) -> locations.add(p.toString()));
-        } else {
-            while (env.hasParameter()) {
-                locations.add(env.nextParameter());
-            }
+        }
+        // process the rest of non-options parameters as locations.
+        while (env.hasParameter()) {
+            locations.add(env.nextParameter());
         }
 
         for (String spec : locations) {
@@ -271,6 +271,10 @@ public RuntimeException err(String messageKey, Object... args) {
                 if (!f.exists()) {
                     f = null;
                     u = spec;
+                    // create an URI, just to fail fast, if URI is wrong:
+                    URL check = new URL(spec);
+                    // ... and use it somehow, so ECJ does not fail the gate.
+                    assert check.toString() != null;
                 }
             }
             addComponentSpec(f, u);