You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2016/08/07 12:16:23 UTC
svn commit: r1755437 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceRGB.java
Author: tilman
Date: Sun Aug 7 12:16:22 2016
New Revision: 1755437
URL: http://svn.apache.org/viewvc?rev=1755437&view=rev
Log:
PDFBOX-3375: revert solution of Philip Helger, didn't work either
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=1755437&r1=1755436&r2=1755437&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 Sun Aug 7 12:16:22 2016
@@ -23,9 +23,6 @@ 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;
/**
@@ -41,7 +38,6 @@ 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 lock = new ReentrantLock ();
private volatile ColorSpace awtColorSpace;
private PDDeviceRGB()
@@ -58,8 +54,7 @@ public final class PDDeviceRGB extends P
{
return;
}
- lock.lock ();
- try
+ synchronized (this)
{
// we might have been waiting for another thread, so check again
if (awtColorSpace != null)
@@ -73,10 +68,6 @@ 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
- {
- lock.unlock();
- }
}
@Override