revert change to existing empty sources check

sugarmanz · sugarmanz · commit 4868acf3717e · 2024-01-25T15:17:32.000-05:00
diff --git a/private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/MergeJars.java b/private/tools/java/com/github/bazelbuild/rules_jvm_external/jar/MergeJars.java
@@ -102,7 +102,6 @@ public static void main(String[] args) throws IOException {
       }
     }
 
-    Objects.requireNonNull(out, "Output path must be set.");
     if (packaging == Packaging.AAR) {
       aarSource = sources.stream()
               .filter(source ->  aarMatcher.matches(source.getFileName()))
@@ -121,7 +120,10 @@ public static void main(String[] args) throws IOException {
         }
       }
       sources.add(aarClassesJar);
-    } else if (sources.isEmpty()) {
+    }
+
+    Objects.requireNonNull(out, "Output path must be set.");
+    if (sources.isEmpty()) {
       // Just write an empty jar and leave
       try (OutputStream fos = Files.newOutputStream(out);
           JarOutputStream jos = new JarOutputStream(fos)) {

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ public static void main(String[] args) throws IOException {`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`105`		`- Objects.requireNonNull(out, "Output path must be set.");`
`106`	`105`	`if (packaging == Packaging.AAR) {`
`107`	`106`	`aarSource = sources.stream()`
`108`	`107`	`.filter(source -> aarMatcher.matches(source.getFileName()))`
`@@ -121,7 +120,10 @@ public static void main(String[] args) throws IOException {`
`121`	`120`	`}`
`122`	`121`	`}`
`123`	`122`	`sources.add(aarClassesJar);`
`124`		`- } else if (sources.isEmpty()) {`
	`123`	`+ }`
	`124`	`+`
	`125`	`+ Objects.requireNonNull(out, "Output path must be set.");`
	`126`	`+ if (sources.isEmpty()) {`
`125`	`127`	`// Just write an empty jar and leave`
`126`	`128`	`try (OutputStream fos = Files.newOutputStream(out);`
`127`	`129`	`JarOutputStream jos = new JarOutputStream(fos)) {`