# HG changeset patch
# User naoto
# Date 1466457571 25200
#      Mon Jun 20 14:19:31 2016 -0700
# Node ID 6ef48972acd285fb2eebdf9066a4b75a4de838a3
# Parent  59c4daf11af48bb30511886e8b46f8abaff2483d
imported patch 8159781

diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
@@ -83,14 +83,14 @@
         "sun.util.resources.provider");
     private static final String METAINFONAME = "LocaleDataMetaInfo";
     private static final String META_FILES =
-        "*module-info.class," +
-        "*LocaleDataProvider.class," +
-        "*" + METAINFONAME + ".class,";
+        ".+module-info.class," +
+        ".+LocaleDataProvider.class," +
+        ".+" + METAINFONAME + ".class,";
     private static final String INCLUDE_LOCALE_FILES =
-        "*sun/text/resources/ext/[^\\/]+_%%.class," +
-        "*sun/util/resources/ext/[^\\/]+_%%.class," +
-        "*sun/text/resources/cldr/ext/[^\\/]+_%%.class," +
-        "*sun/util/resources/cldr/ext/[^\\/]+_%%.class,";
+        ".+sun/text/resources/ext/[^_]+_%%.class," +
+        ".+sun/util/resources/ext/[^_]+_%%.class," +
+        ".+sun/text/resources/cldr/ext/[^_]+_%%.class," +
+        ".+sun/util/resources/cldr/ext/[^_]+_%%.class,";
     private Predicate<String> predicate;
     private String userParam;
     private List<Locale.LanguageRange> priorityList;
@@ -209,6 +209,7 @@
         String value = META_FILES + filtered.stream()
             .map(s -> includeLocaleFilePatterns(s))
             .collect(Collectors.joining(","));
+        value = value.replaceAll("(.+?),+", "regex:$1,");
         predicate = ResourceFilter.includeFilter(value);
     }
 
@@ -253,8 +254,8 @@
 
         // Add Thai BreakIterator related data files
         if (lang.equals("th")) {
-            files += "*sun/text/resources/thai_dict," +
-                     "*sun/text/resources/[^\\/]+BreakIteratorData_th,";
+            files += ".+sun/text/resources/thai_dict," +
+                     ".+sun/text/resources/[^_]+BreakIteratorData_th,";
         }
 
         // Add Taiwan resource bundles for Hong Kong
diff --git a/test/ProblemList.txt b/test/ProblemList.txt
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -387,8 +387,6 @@
 
 # core_tools
 
-tools/jlink/plugins/IncludeLocalesPluginTest.java               8159781 generic-all
-
 tools/jlink/JLinkOptimTest.java                                 8159264 generic-all
 
 ############################################################################