FOP-2560: PDF to PDF corrupt after reuse of FopFactory
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-2_1@1723548 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/fop/apps/FOUserAgent.java b/src/java/org/apache/fop/apps/FOUserAgent.java
index 9e317f9..6434ce3 100644
--- a/src/java/org/apache/fop/apps/FOUserAgent.java
+++ b/src/java/org/apache/fop/apps/FOUserAgent.java
@@ -134,6 +134,7 @@
protected String keywords;
private final ImageSessionContext imageSessionContext;
+ private final SoftMapCache pdfObjectCache = new SoftMapCache(true);
/**
* Main constructor. <b>This constructor should not be called directly. Please use the
@@ -807,6 +808,6 @@
}
public SoftMapCache getPDFObjectCache() {
- return factory.getPDFObjectCache();
+ return pdfObjectCache;
}
}
diff --git a/src/java/org/apache/fop/apps/FopFactory.java b/src/java/org/apache/fop/apps/FopFactory.java
index 50211d3..d9c9708 100644
--- a/src/java/org/apache/fop/apps/FopFactory.java
+++ b/src/java/org/apache/fop/apps/FopFactory.java
@@ -37,7 +37,6 @@
import org.apache.xmlgraphics.image.loader.ImageContext;
import org.apache.xmlgraphics.image.loader.ImageManager;
import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext.FallbackResolver;
-import org.apache.xmlgraphics.image.loader.util.SoftMapCache;
import org.apache.xmlgraphics.util.UnitConv;
import org.apache.fop.apps.io.InternalResourceResolver;
@@ -83,8 +82,6 @@
private final ColorSpaceCache colorSpaceCache;
- private final SoftMapCache pdfObjectCache = new SoftMapCache(true);
-
private final FopFactoryConfig config;
private final InternalResourceResolver resolver;
@@ -436,8 +433,4 @@
public ColorSpaceCache getColorSpaceCache() {
return this.colorSpaceCache;
}
-
- public SoftMapCache getPDFObjectCache() {
- return pdfObjectCache;
- }
}