From 5d185fbb325bba127fe732b9eb9513d4e30e3c32 Mon Sep 17 00:00:00 2001 From: Adrian Cumiskey Date: Sun, 15 Aug 2010 16:36:59 +0000 Subject: [PATCH] FIX: The cache-file setting should still be set even if use-cache setting is not provided (as it defaults to true). git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@985703 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/fop/fonts/FontManagerConfigurator.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/java/org/apache/fop/fonts/FontManagerConfigurator.java b/src/java/org/apache/fop/fonts/FontManagerConfigurator.java index ecbbf8ec6..7792b118d 100644 --- 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) { -- 2.39.5