You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ss...@apache.org on 2016/01/07 15:03:28 UTC
svn commit: r1723548 - in
/xmlgraphics/fop/branches/fop-2_1/src/java/org/apache/fop/apps:
FOUserAgent.java FopFactory.java
Author: ssteiner
Date: Thu Jan 7 14:03:28 2016
New Revision: 1723548
URL: http://svn.apache.org/viewvc?rev=1723548&view=rev
Log:
FOP-2560: PDF to PDF corrupt after reuse of FopFactory
Modified:
xmlgraphics/fop/branches/fop-2_1/src/java/org/apache/fop/apps/FOUserAgent.java
xmlgraphics/fop/branches/fop-2_1/src/java/org/apache/fop/apps/FopFactory.java
Modified: xmlgraphics/fop/branches/fop-2_1/src/java/org/apache/fop/apps/FOUserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-2_1/src/java/org/apache/fop/apps/FOUserAgent.java?rev=1723548&r1=1723547&r2=1723548&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-2_1/src/java/org/apache/fop/apps/FOUserAgent.java (original)
+++ xmlgraphics/fop/branches/fop-2_1/src/java/org/apache/fop/apps/FOUserAgent.java Thu Jan 7 14:03:28 2016
@@ -134,6 +134,7 @@ public class FOUserAgent {
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 class FOUserAgent {
}
public SoftMapCache getPDFObjectCache() {
- return factory.getPDFObjectCache();
+ return pdfObjectCache;
}
}
Modified: xmlgraphics/fop/branches/fop-2_1/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-2_1/src/java/org/apache/fop/apps/FopFactory.java?rev=1723548&r1=1723547&r2=1723548&view=diff
==============================================================================
--- xmlgraphics/fop/branches/fop-2_1/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/branches/fop-2_1/src/java/org/apache/fop/apps/FopFactory.java Thu Jan 7 14:03:28 2016
@@ -37,7 +37,6 @@ import org.apache.commons.logging.LogFac
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 @@ public final class FopFactory implements
private final ColorSpaceCache colorSpaceCache;
- private final SoftMapCache pdfObjectCache = new SoftMapCache(true);
-
private final FopFactoryConfig config;
private final InternalResourceResolver resolver;
@@ -436,8 +433,4 @@ public final class FopFactory implements
public ColorSpaceCache getColorSpaceCache() {
return this.colorSpaceCache;
}
-
- public SoftMapCache getPDFObjectCache() {
- return pdfObjectCache;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org