svn commit: r1723541 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/apps: FOUserAgent.java FopFactory.java

[ss...@apache.org]

Author: ssteiner
Date: Thu Jan  7 13:41:10 2016
New Revision: 1723541

URL: http://svn.apache.org/viewvc?rev=1723541&view=rev
Log:
FOP-2560: PDF to PDF corrupt after reuse of FopFactory

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java?rev=1723541&r1=1723540&r2=1723541&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FOUserAgent.java Thu Jan  7 13:41:10 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/trunk/src/java/org/apache/fop/apps/FopFactory.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java?rev=1723541&r1=1723540&r2=1723541&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactory.java Thu Jan  7 13:41:10 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