From 256e3bab87caa7f08b2e31677b8b40526d2ed3d3 Mon Sep 17 00:00:00 2001
From: Athijegannathan Sundararajan <sundar@openjdk.org>
Date: Wed, 7 Sep 2016 18:35:21 +0530
Subject: [PATCH] 8165503: jlink exclude VM plugin's handling of jvmlibs is
 wrong

Reviewed-by: jlaskey
---
 .../jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java
index 549b6abfd54..20e7ef26b1f 100644
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java
@@ -103,7 +103,9 @@ public final class ExcludeVMPlugin implements Plugin {
         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());