You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2016/05/27 17:21:05 UTC
svn commit: r1745783 - in /pdfbox/branches/2.0: ./
fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
Author: lehmi
Date: Fri May 27 17:21:05 2016
New Revision: 1745783
URL: http://svn.apache.org/viewvc?rev=1745783&view=rev
Log:
PDFBOX-3267: synchronize render operation for thread safety
Modified:
pdfbox/branches/2.0/ (props changed)
pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
Propchange: pdfbox/branches/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 27 17:21:05 2016
@@ -1,3 +1,3 @@
/pdfbox/branches/no-awt:1618517-1621410
/pdfbox/no-awt:1618514-1618516
-/pdfbox/trunk:1736223,1736227,1736615,1737043,1737130,1737599-1737600,1738755,1740160,1742437,1742442,1745595,1745606
+/pdfbox/trunk:1736223,1736227,1736615,1737043,1737130,1737599-1737600,1738755,1740160,1742437,1742442,1745595,1745606,1745774,1745776
Modified: pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java?rev=1745783&r1=1745782&r2=1745783&view=diff
==============================================================================
--- pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java (original)
+++ pdfbox/branches/2.0/fontbox/src/main/java/org/apache/fontbox/cff/Type1CharString.java Fri May 27 17:21:05 2016
@@ -87,9 +87,12 @@ public class Type1CharString
*/
public Rectangle2D getBounds()
{
- if (path == null)
+ synchronized(LOG)
{
- render();
+ if (path == null)
+ {
+ render();
+ }
}
return path.getBounds2D();
}
@@ -100,9 +103,12 @@ public class Type1CharString
*/
public int getWidth()
{
- if (path == null)
+ synchronized(LOG)
{
- render();
+ if (path == null)
+ {
+ render();
+ }
}
return width;
}
@@ -113,9 +119,12 @@ public class Type1CharString
*/
public GeneralPath getPath()
{
- if (path == null)
+ synchronized(LOG)
{
- render();
+ if (path == null)
+ {
+ render();
+ }
}
return path;
}