TS-41980 Handle nested jars for converter

agent/src/main/java/com/teamscale/jacoco/agent/convert/Converter.java

@@ -40,29 +40,29 @@
 	}
 
 	/** Converts one .exec binary coverage file to XML. */
 	public void runJaCoCoReportGeneration() throws IOException, AgentOptionParseException {
 		List<File> jacocoExecutionDataList = ReportUtils
 				.listFiles(ETestArtifactFormat.JACOCO, arguments.getInputFiles());
 
 		ExecFileLoader loader = new ExecFileLoader();
 		for (File jacocoExecutionData : jacocoExecutionDataList) {
 			loader.load(jacocoExecutionData);
 		}
 
 		SessionInfo sessionInfo = loader.getSessionInfoStore().getMerged("merged");
 		ExecutionDataStore executionDataStore = loader.getExecutionDataStore();
 
 		Logger logger = LoggingUtils.getLogger(this);
 		JaCoCoXmlReportGenerator generator = new JaCoCoXmlReportGenerator(arguments.getClassDirectoriesOrZips(),
 				getWildcardIncludeExcludeFilter(), arguments.getDuplicateClassFileBehavior(), arguments.shouldIgnoreUncoveredClasses,
 				wrap(logger));
 
 		try (Benchmark benchmark = new Benchmark("Generating the XML report")) {
 			generator.convert(new Dump(sessionInfo, executionDataStore), Paths.get(arguments.outputFile).toFile());
 		} catch (EmptyReportException e) {
-			logger.warn("Converted report was emtpy.", e);
+			logger.warn("Converted report was empty.", e);
 		}
 	}
 
 	/** Converts one .exec binary coverage file, test details and test execution files to JSON testwise coverage. */
 	public void runTestwiseCoverageReportGeneration() throws IOException, AgentOptionParseException {

report-generator/src/main/kotlin/com/teamscale/report/jacoco/FilteringAnalyzer.kt

@@ -68,13 +68,12 @@
 	 * and added wrapping [BashFileSkippingInputStream].
 	 */
 	@Throws(IOException::class)
 	protected open fun analyzeJar(input: InputStream, location: String): Int {
-		ZipInputStream(BashFileSkippingInputStream(input)).use { zip ->
-			return generateSequence { zip.nextEntry(location) }
+		val zip = ZipInputStream(BashFileSkippingInputStream(input))
+		return generateSequence { zip.nextEntry(location) }
 				.map { entry -> analyzeAll(zip, "$location@${entry.name}") }
 				.sum()
-		}
 	}
 
 	/** Copied from [org.jacoco.core.analysis.Analyzer.nextEntry].  */
 	@Throws(IOException::class)

report-generator/src/main/kotlin/com/teamscale/report/util/BashFileSkippingInputStream.kt

@@ -46,8 +46,6 @@ class BashFileSkippingInputStream(input: InputStream) : FilterInputStream(Buffer
 			`in`.mark(BUFFER_SIZE)
 			bytesRead = `in`.read(buffer, 0, BUFFER_SIZE)
 		}
-
-		throw IOException("ZIP header not found in the input stream.")
 	}
 
 	/**