diff options
| author | Glenn Adams <gadams@apache.org> | 2012-06-24 20:03:07 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2012-06-24 20:03:07 +0000 |
| commit | 2a631ed3af3a578339a76cbf91b6b649523ccf05 (patch) | |
| tree | 744cbf59c3624e9ca631d0ef1fd8ec44c8d222cc | |
| parent | f7c9ea74d2157769b664aee9fcd3f2d00bb32e05 (diff) | |
| download | xmlgraphics-fop-2a631ed3af3a578339a76cbf91b6b649523ccf05.tar.gz xmlgraphics-fop-2a631ed3af3a578339a76cbf91b6b649523ccf05.zip | |
Bugzilla #53458: Fix incorrect language and country code key generation in hyphenation tree cache.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1353320 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | findbugs-exclude.xml | 5 | ||||
| -rw-r--r-- | src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java | 2 | ||||
| -rw-r--r-- | status.xml | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml index a52209c32..a764eac41 100644 --- a/findbugs-exclude.xml +++ b/findbugs-exclude.xml @@ -959,11 +959,6 @@ <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"/> <Bug pattern="SA_FIELD_SELF_COMPARISON"/> diff --git a/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java b/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java index c5845977f..1617d32d5 100644 --- 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 58c6bb81c..8d41fdef4 100644 --- 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> |