Author: gadams
Date: Sun Jun 24 20:03:07 2012
New Revision: 1353320
URL: http://svn.apache.org/viewvc?rev=1353320&view=rev
Log:
Bugzilla #53458: Fix incorrect language and country code key generation in
hyphenation tree cache.
Modified:
xmlgraphics/fop/trunk/findbugs-exclude.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/findbugs-exclude.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/findbugs-exclude.xml?rev=1353320&r1=1353319&r2=1353320&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/findbugs-exclude.xml (original)
+++ xmlgraphics/fop/trunk/findbugs-exclude.xml Sun Jun 24 20:03:07 2012
@@ -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"/>
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java?rev=1353320&r1=1353319&r2=1353320&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java
Sun Jun 24 20:03:07 2012
@@ -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;
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1353320&r1=1353319&r2=1353320&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Sun Jun 24 20:03:07 2012
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]