Fixed concurrency issue re:background-image on a fo:block. Also updated a couple...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1331419 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/examples/embedding/java/embedding/ExampleEPS.java b/examples/embedding/java/embedding/ExampleEPS.java
index ebf2b9a7df4346ec4b7e107ab3df181718f89da4..d35413f60bf94115a7ba7453e27b33e993900c44 100644 (file)
--- a/examples/embedding/java/embedding/ExampleEPS.java
+++ b/examples/embedding/java/embedding/ExampleEPS.java
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /* $Id$ */
@@ -26,11 +26,13 @@ import java.io.OutputStream;
 
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+
+import org.apache.xmlgraphics.java2d.GraphicContext;
+import org.apache.xmlgraphics.java2d.ps.EPSDocumentGraphics2D;
+
 import org.apache.fop.fonts.FontInfo;
 import org.apache.fop.render.ps.NativeTextHandler;
 import org.apache.fop.svg.PDFDocumentGraphics2DConfigurator;
-import org.apache.xmlgraphics.java2d.GraphicContext;
-import org.apache.xmlgraphics.java2d.ps.EPSDocumentGraphics2D;
 
 public class ExampleEPS {
 

diff --git a/examples/embedding/java/embedding/ExampleEPSSimple.java b/examples/embedding/java/embedding/ExampleEPSSimple.java
index cbc353cd52c9968a46c485e34be1d2e76bf2fd73..eec6d89f67fc7af2a1a8925cc8f80d12ceda97d5 100644 (file)
--- a/examples/embedding/java/embedding/ExampleEPSSimple.java
+++ b/examples/embedding/java/embedding/ExampleEPSSimple.java
@@ -1,33 +1,33 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /* $Id$ */
 
-
 package embedding;
 
 import java.awt.Font;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 
-import org.apache.fop.render.ps.NativeTextHandler;
 import org.apache.xmlgraphics.java2d.GraphicContext;
 import org.apache.xmlgraphics.java2d.ps.EPSDocumentGraphics2D;
 
+import org.apache.fop.render.ps.NativeTextHandler;
+
 public class ExampleEPSSimple {
 
   /**

diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
index 789b8d4ed535c2b6d34e998eff2ed08bb9e48427..0e7f3d9789302dd276150ce727bfdaa0219aae72 100644 (file)
--- a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
+++ b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java
@@ -348,9 +348,7 @@ public class CommonBorderPaddingBackground {
      */
     public static CommonBorderPaddingBackground getInstance(PropertyList pList)
         throws PropertyException {
-
-        CommonBorderPaddingBackground newInstance
-                = new CommonBorderPaddingBackground(pList);
+        CommonBorderPaddingBackground newInstance = new CommonBorderPaddingBackground(pList);
         CommonBorderPaddingBackground cachedInstance = null;
         /* if padding-* and background-position-* resolve to absolute lengths
          * the whole instance can be cached */
@@ -368,33 +366,33 @@ public class CommonBorderPaddingBackground {
                     || newInstance.backgroundPositionVertical.isAbsolute())) {
             cachedInstance = CACHE.fetch(newInstance);
         }
-
-        /* for non-cached, or not-yet-cached instances, preload the image */
-        if ((cachedInstance == null
-                || cachedInstance == newInstance)
+        synchronized (newInstance.backgroundImage.intern()) {
+            /* for non-cached, or not-yet-cached instances, preload the image */
+            if ((cachedInstance == null || cachedInstance == newInstance)
                 && !("".equals(newInstance.backgroundImage))) {
-            //Additional processing: preload image
-            String uri = URISpecification.getURL(newInstance.backgroundImage);
-            FObj fobj = pList.getFObj();
-            FOUserAgent userAgent = pList.getFObj().getUserAgent();
-            ImageManager manager = userAgent.getFactory().getImageManager();
-            ImageSessionContext sessionContext = userAgent.getImageSessionContext();
-            ImageInfo info;
-            try {
-                info = manager.getImageInfo(uri, sessionContext);
-                newInstance.backgroundImageInfo = info;
-            } catch (ImageException e) {
-                ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
-                        fobj.getUserAgent().getEventBroadcaster());
-                eventProducer.imageError(fobj, uri, e, fobj.getLocator());
-            } catch (FileNotFoundException fnfe) {
-                ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
-                        fobj.getUserAgent().getEventBroadcaster());
-                eventProducer.imageNotFound(fobj, uri, fnfe, fobj.getLocator());
-            } catch (IOException ioe) {
-                ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
-                        fobj.getUserAgent().getEventBroadcaster());
-                eventProducer.imageIOError(fobj, uri, ioe, fobj.getLocator());
+                //Additional processing: preload image
+                String uri = URISpecification.getURL(newInstance.backgroundImage);
+                FObj fobj = pList.getFObj();
+                FOUserAgent userAgent = pList.getFObj().getUserAgent();
+                ImageManager manager = userAgent.getFactory().getImageManager();
+                ImageSessionContext sessionContext = userAgent.getImageSessionContext();
+                ImageInfo info;
+                try {
+                    info = manager.getImageInfo(uri, sessionContext);
+                    newInstance.backgroundImageInfo = info;
+                } catch (ImageException e) {
+                    ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
+                            fobj.getUserAgent().getEventBroadcaster());
+                    eventProducer.imageError(fobj, uri, e, fobj.getLocator());
+                } catch (FileNotFoundException fnfe) {
+                    ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
+                            fobj.getUserAgent().getEventBroadcaster());
+                    eventProducer.imageNotFound(fobj, uri, fnfe, fobj.getLocator());
+                } catch (IOException ioe) {
+                    ResourceEventProducer eventProducer = ResourceEventProducer.Provider.get(
+                            fobj.getUserAgent().getEventBroadcaster());
+                    eventProducer.imageIOError(fobj, uri, ioe, fobj.getLocator());
+                }
             }
         }