FIX: The cache-file setting should still be set even if use-cache setting is not...

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

diff --git a/src/java/org/apache/fop/fonts/FontManagerConfigurator.java b/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
index ecbbf8ec65a12bdb043a874f1c818bf89c2e0512..7792b118d0372d7bbb90b9af79d46a5010dae080 100644 (file)
--- a/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
+++ b/src/java/org/apache/fop/fonts/FontManagerConfigurator.java
@@ -63,11 +63,15 @@ public class FontManagerConfigurator {
         if (cfg.getChild("use-cache", false) != null) {
             try {
                 fontManager.setUseCache(cfg.getChild("use-cache").getValueAsBoolean());
-                if (cfg.getChild("cache-file", false) != null) {
-                    fontManager.setCacheFile(new File(cfg.getChild("cache-file").getValue()));
-                }
-            } catch (ConfigurationException mfue) {
-                LogUtil.handleException(log, mfue, true);
+            } catch (ConfigurationException e) {
+                LogUtil.handleException(log, e, true);
+            }
+        }
+        if (cfg.getChild("cache-file", false) != null) {
+            try {
+                fontManager.setCacheFile(new File(cfg.getChild("cache-file").getValue()));
+            } catch (ConfigurationException e) {
+                LogUtil.handleException(log, e, true);
             }
         }
         if (cfg.getChild("font-base", false) != null) {