Bugzilla #53458: Fix incorrect language and country code key generation in hyphenatio...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1353320 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index a52209c32cedc24e1778ec2b160bc3d28c707782..a764eac41fdeead209de41da723277c2ed3e5970 100644 (file)
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -958,11 +958,6 @@
       <Method name="getInputStreamOnFont"/>
       <Bug pattern="RV_EXCEPTION_NOT_THROWN"/>
    </Match>
-   <Match>
-      <Class name="org.apache.fop.hyphenation.HyphenationTreeCache"/>
-      <Method name="constructUserKey"/>
-      <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
-   </Match>
    <Match>
       <Class name="org.apache.fop.afp.AFPResourceLevel"/>
       <Method name="equals"/>

diff --git a/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java b/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
index c5845977f84eccbe500d2737e7b2a7c0f4c88507..1617d32d5169a01132bc7b36aa0fbaf110223755 100644 (file)
--- a/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
+++ b/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
@@ -79,7 +79,7 @@ public class HyphenationTreeCache {
         String userKey = null;
         if (hyphPatNames != null) {
             String key = constructLlccKey(lang, country);
-            key.replace('_', '-');
+            key = key.replace('_', '-');
             userKey = (String) hyphPatNames.get(key);
         }
         return userKey;

diff --git a/status.xml b/status.xml
index 58c6bb81c1c7758643a49845e63fcbdcc3209117..8d41fdef4caaf33d1561cbb720453856862b5238 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -63,6 +63,9 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Code" dev="GA" type="fix" fixes-bug="53458" due-to="Dieter von Holten">
+        Fix incorrect language and country code key generation in hyphenation tree cache.
+      </action>
       <action context="Images" dev="GA" type="fix" fixes-bug="53431" due-to="Luis Bernardo">
         Fix incorrect SVG line dash pattern with PDF output format.
       </action>