8165503: jlink exclude VM plugin's handling of jvmlibs is wrong
authorsundar
Wed, 07 Sep 2016 18:35:21 +0530
changeset 40790 7095191b31b3
parent 40789 43b42538af90
child 40791 a080a12eaa93
8165503: jlink exclude VM plugin's handling of jvmlibs is wrong Reviewed-by: jlaskey
jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java	Wed Sep 07 10:14:48 2016 +0300
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java	Wed Sep 07 18:35:21 2016 +0530
@@ -103,7 +103,9 @@
         List<ResourcePoolEntry> ret = javaBase.entries().filter((t) -> {
             String path = t.path();
             for (String jvmlib : jvmlibs) {
-                return t.path().endsWith("/" + jvmlib);
+                if (t.path().endsWith("/" + jvmlib)) {
+                    return true;
+                }
             }
             return false;
         }).collect(Collectors.toList());