svn commit: r1531871 - /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledSoftReference.java

[ma...@apache.org]

Author: markt
Date: Mon Oct 14 12:15:36 2013
New Revision: 1531871

URL: http://svn.apache.org/r1531871
Log:
Fix a thread-safety issue highlighted by FindBugs 

Modified:
    commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledSoftReference.java

Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledSoftReference.java
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledSoftReference.java?rev=1531871&r1=1531870&r2=1531871&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledSoftReference.java (original)
+++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledSoftReference.java Mon Oct 14 12:15:36 2013
@@ -20,7 +20,7 @@ import java.lang.ref.SoftReference;
 
 /**
  * Extension of {@link DefaultPooledObject} to wrap pooled soft references.
- * 
+ *
  * <p>This class is intended to be thread-safe.</p>
  *
  * @param <T> the type of the underlying object that the wrapped SoftReference
@@ -33,11 +33,11 @@ import java.lang.ref.SoftReference;
 public class PooledSoftReference<T> extends DefaultPooledObject<T> {
 
     /** SoftReference wrapped by this object */
-    private SoftReference<T> reference;
+    private volatile SoftReference<T> reference;
 
     /**
      * Creates a new PooledSoftReference wrapping the provided reference.
-     * 
+     *
      * @param reference SoftReference to be managed by the pool
      */
     public PooledSoftReference(SoftReference<T> reference) {
@@ -50,7 +50,7 @@ public class PooledSoftReference<T> exte
      * <p>
      * Note that if the reference has been cleared, this method will return
      * null.
-     * 
+     *
      * @return Object referred to by the SoftReference
      */
     @Override
@@ -74,24 +74,24 @@ public class PooledSoftReference<T> exte
         // TODO add other attributes
         // TODO encapsulate state and other attribute display in parent
     }
-    
+
     /**
      * Returns the SoftReference wrapped by this object.
-     * 
+     *
      * @return underlying SoftReference
      */
     public synchronized SoftReference<T> getReference() {
         return reference;
     }
-    
+
     /**
      * Sets the wrapped reference.
-     * 
+     *
      * <p>This method exists to allow a new, non-registered reference to be
      * held by the pool to track objects that have been checked out of the pool.
      * The actual parameter <strong>should</strong> be a reference to the same
      * object that {@link #getObject()} returns before calling this method.</p>
-     * 
+     *
      * @param reference new reference
      */
     public synchronized void setReference(SoftReference<T> reference) {