From 4cbc7d251024d618cd0cad3f26cb533424851d1f Mon Sep 17 00:00:00 2001 From: Martin Mirchev Date: Wed, 18 Nov 2026 09:25:56 +0800 Subject: [PATCH] COMPRESS-736: Check all pass rules in PackingOptions.isPassFile() isPassFile() returned the result of the first directory rule, so a directory rule that does not match hid all later rules. Return true on a match and otherwise go on to the next rule. Assisted-By: Claude Code:claude-opus-5-5 --- .../compress/harmony/pack200/PackingOptions.java | 4 +++- .../harmony/pack200/PackingOptionsTest.java | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingOptions.java b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingOptions.java index e6c1eea32ef..be515982fc2 100644 --- a/src/main/java/org/apache/commons/compress/harmony/pack200/PackingOptions.java +++ b/src/main/java/org/apache/commons/compress/harmony/pack200/PackingOptions.java @@ -339,7 +339,9 @@ public boolean isPassFile(final String passFileName) { // files under "org/apache/harmony/pack200/") pass += "/"; } - return passFileName.startsWith(pass); + if (passFileName.startsWith(pass)) { + return true; + } } } return false; diff --git a/src/test/java/org/apache/commons/compress/harmony/pack200/PackingOptionsTest.java b/src/test/java/org/apache/commons/compress/harmony/pack200/PackingOptionsTest.java index cd7fb2b80d2..917ab7dab28 100644 --- a/src/test/java/org/apache/commons/compress/harmony/pack200/PackingOptionsTest.java +++ b/src/test/java/org/apache/commons/compress/harmony/pack200/PackingOptionsTest.java @@ -541,4 +541,20 @@ private void unpackJar(final File sourceFile, final File destFile) throws Pack20 } } + + /** + * Tests that a directory pass rule that does not match the file does not hide later rules. + */ + @Test + void testIsPassFileChecksAllRules() { + final PackingOptions options = new PackingOptions(); + options.addPassFile("org/apache/other"); + options.addPassFile("org/apache/Foo.class"); + options.addPassFile("org/apache/pass"); + assertTrue(options.isPassFile("org/apache/Foo.class")); + assertTrue(options.isPassFile("org/apache/pass/Bar.class")); + assertTrue(options.isPassFile("org/apache/other/Baz.class")); + assertFalse(options.isPassFile("org/apache/Qux.class")); + assertFalse(options.isPassFile("org/apache/passing/Bar.class")); + } }