svn commit: r1754170 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java

[ti...@apache.org]

Author: tilman
Date: Tue Jul 26 19:12:21 2016
New Revision: 1754170

URL: http://svn.apache.org/viewvc?rev=1754170&view=rev
Log:
PDFBOX-3375: use explicit lock object, as suggested by Philip Helger a

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java?rev=1754170&r1=1754169&r2=1754170&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java Tue Jul 26 19:12:21 2016
@@ -23,6 +23,9 @@ import java.awt.image.ColorModel;
 import java.awt.image.ComponentColorModel;
 import java.awt.image.WritableRaster;
 import java.io.IOException;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 import org.apache.pdfbox.cos.COSName;
 
 /**
@@ -38,6 +41,7 @@ public final class PDDeviceRGB extends P
     public static final PDDeviceRGB INSTANCE = new PDDeviceRGB();
     
     private final PDColor initialColor = new PDColor(new float[] { 0, 0, 0 }, this);
+    private final Lock m_aRWLock = new ReentrantLock ();
     private volatile ColorSpace awtColorSpace;
     
     private PDDeviceRGB()
@@ -54,7 +58,8 @@ public final class PDDeviceRGB extends P
         {
             return;
         }
-        synchronized (this)
+        m_aRWLock.lock ();
+        try
         {
             // we might have been waiting for another thread, so check again
             if (awtColorSpace != null)
@@ -68,6 +73,10 @@ public final class PDDeviceRGB extends P
             // an initial color conversion while we're still synchronized, see PDFBOX-2184
             awtColorSpace.toRGB(new float[] { 0, 0, 0, 0 });
         }
+        finally
+        {
+            m_aRWLock.unlock();
+        }
     }
     
     @Override