From: Glenn Adams <gadams@apache.org>
Date: Tue, 24 Apr 2012 22:28:42 +0000 (+0000)
Subject: Bugzilla #53143: Ensure fonts are not loaded twice (redundantly).
X-Git-Tag: fop-1_1rc1old~33
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6d5a9a834dd6f884ad72511acf5cd883343b8782;p=xmlgraphics-fop.git

Bugzilla #53143: Ensure fonts are not loaded twice (redundantly).

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

diff --git a/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java b/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java
index 3c1a94f63..8100c4b9b 100644
--- a/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java
+++ b/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java
@@ -168,7 +168,6 @@ public class FontFileFinder extends DirectoryWalker implements FontFinder {
      */
     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);
diff --git a/status.xml b/status.xml
index 1e5ea7dfb..4b68a6494 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="Fonts" dev="GA" type="fix" fixes-bug="53143">
+        Ensure fonts are not loaded twice (redundantly).
+      </action>
       <action context="Test" dev="GA" type="update" fixes-bug="50196" due-to="Matthias Reischenbacher">
         Add test for basic-link with padding.
       </action>