changeset 17726:c49bca5eedb3

8165503: jlink exclude VM plugin's handling of jvmlibs is wrong Reviewed-by: jlaskey
author sundar
date Wed, 07 Sep 2016 18:35:21 +0530
parents 60d7fbe25cd7
children 7916fca71cd6
files src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java	Wed Sep 07 10:14:48 2016 +0300
+++ b/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());