[FOP-2055] fonts loaded twice (redundantly)

• Type: Bug
• Status: Resolved
• Resolution: Fixed
• Affects Version/s: 2.5
• Component/s: font/unqualified
• Environment: Operating System: All; Platform: All
• External issue ID: 53143
• Assignee: fop-dev
• Reporter: Glenn Adams
• Created: 24/Apr/12 22:14
• Updated: 24/Apr/12 22:42
• Resolved: 24/Apr/12 22:42

Description

due to a coding error introduced in revision 1198853 [1], fonts are redundantly loaded twice

[1] http://svn.apache.org/viewvc?view=revision&revision=1198853

more specifically, the code change at [2]

[2] http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java?r1=1198853&r2=1198852&pathrev=1198853

namely

public List<URL> find(String dir) throws IOException {
List<URL> results = new java.util.ArrayList<URL>();
super.walk(new File(dir), results);
+ File directory = new File(dir);
+ if (!directory.isDirectory())

{ + eventListener.fontDirectoryNotFound(this, dir); + }

else

{ + super.walk(directory, results); + }

return results;
}

results in calling super.walk(...) twice which has the effect of adding each font twice to the returned List<URL>, which in turn results in each font being loaded twice in FontInfoConfigurator.addDirectories():

fontURLList = fontFileFinder.find(directory);
fontAdder.add(fontURLList, fontInfoList);