aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache
diff options
context:
space:
mode:
authorAdrian Cumiskey <acumiskey@apache.org>2010-08-15 16:36:59 +0000
committerAdrian Cumiskey <acumiskey@apache.org>2010-08-15 16:36:59 +0000
commit5d185fbb325bba127fe732b9eb9513d4e30e3c32 (patch)
tree2c7171b6c023eb175d6a5282d73d7b5d75476308 /src/java/org/apache
parentff3a0b1f92bef5b6384c286a5944d2d5df96fe41 (diff)
downloadxmlgraphics-fop-5d185fbb325bba127fe732b9eb9513d4e30e3c32.tar.gz
xmlgraphics-fop-5d185fbb325bba127fe732b9eb9513d4e30e3c32.zip
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
Diffstat (limited to 'src/java/org/apache')
-rw-r--r--src/java/org/apache/fop/fonts/FontManagerConfigurator.java14
1 files 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) {