FOP-3270: Country specific hyphenation file not found

Author: simonsteiner1984

fop-core/src/main/java/org/apache/fop/hyphenation/HyphenationTreeCache.java

@@ -79,7 +79,6 @@ public static String constructUserKey(String lang, String country, Map hyphPatNa
         String userKey = null;
         if (hyphPatNames != null) {
             String key = constructLlccKey(lang, country);
-            key = key.replace('_', '-');
             userKey = (String) hyphPatNames.get(key);
         }
         return userKey;

fop-core/src/test/java/org/apache/fop/HyphenationTestCase.java

@@ -23,6 +23,8 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.junit.Test;
 
@@ -99,4 +101,15 @@ public void testHyphenatorCache() throws IOException {
         frxml.delete();
         f.delete();
     }
+
+    @Test
+    public void testHyphenatorCountry() {
+        Map<String, String> hyphPatNames = new HashMap<>();
+        hyphPatNames.put("de_CH", "test/resources/fop/fr.xml" + Hyphenator.XMLTYPE);
+        InternalResourceResolver resourceResolver = ResourceResolverFactory.createDefaultInternalResourceResolver(
+                new File(".").toURI());
+        Hyphenation hyph = Hyphenator.hyphenate("de", "CH", resourceResolver, hyphPatNames,
+                "hello", 0, 0, fopFactory.newFOUserAgent());
+        assertEquals(hyph.toString(), "-hel-lo");
+    }
 }