svn commit: r1506916 - in /commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl: DefaultPooledObject.java GenericKeyedObjectPool.java GenericObjectPool.java PoolImplUtils.java PooledObjectImpl.java

[markt]

Author: markt
Date: Thu Jul 25 11:56:41 2013
New Revision: 1506916

URL: http://svn.apache.org/r1506916
Log:
Change name of implementation class

Added:
    
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
      - copied, changed from r1506855, 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledObjectImpl.java
Removed:
    
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledObjectImpl.java
Modified:
    
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
    
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
    
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java

Copied: 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
 (from r1506855, 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledObjectImpl.java)
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java?p2=commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java&p1=commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledObjectImpl.java&r1=1506855&r2=1506916&rev=1506916&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PooledObjectImpl.java
 (original)
+++ 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/DefaultPooledObject.java
 Thu Jul 25 11:56:41 2013
@@ -38,7 +38,7 @@ import org.apache.commons.pool2.TrackedU
  *
  * @since 2.0
  */
-public class PooledObjectImpl<T> implements PooledObject<T> {
+public class DefaultPooledObject<T> implements PooledObject<T> {
 
     private final T object;
     private PooledObjectState state = PooledObjectState.IDLE; // 
@GuardedBy("this") to ensure transitions are valid
@@ -49,7 +49,7 @@ public class PooledObjectImpl<T> impleme
     private Exception borrowedBy = null;
     private PrintWriter logWriter = null;
 
-    public PooledObjectImpl(T object) {
+    public DefaultPooledObject(T object) {
         this.object = object;
     }
 

Modified: 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1506916&r1=1506915&r2=1506916&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
 (original)
+++ 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
 Thu Jul 25 11:56:41 2013
@@ -991,8 +991,8 @@ public class GenericKeyedObjectPool<K,T>
             throw e;
         }
 
-        if (p instanceof PooledObjectImpl) {
-            ((PooledObjectImpl<T> )p).setAbandonedLoqWriter(null);
+        if (p instanceof DefaultPooledObject) {
+            ((DefaultPooledObject<T> )p).setAbandonedLoqWriter(null);
         }
 
         createdCount.incrementAndGet();

Modified: 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1506916&r1=1506915&r2=1506916&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
 (original)
+++ 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
 Thu Jul 25 11:56:41 2013
@@ -790,12 +790,12 @@ public class GenericObjectPool<T> extend
             throw e;
         }
 
-        if (p instanceof PooledObjectImpl) {
+        if (p instanceof DefaultPooledObject) {
             if (isAbandonedConfig() && abandonedConfig.getLogAbandoned()) {
-                ((PooledObjectImpl<T> )p).setAbandonedLoqWriter(
+                ((DefaultPooledObject<T> )p).setAbandonedLoqWriter(
                         abandonedConfig.getLogWriter());
             } else {
-                ((PooledObjectImpl<T> )p).setAbandonedLoqWriter(null);
+                ((DefaultPooledObject<T> )p).setAbandonedLoqWriter(null);
             }
         }
 

Modified: 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java?rev=1506916&r1=1506915&r2=1506916&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java
 (original)
+++ 
commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java
 Thu Jul 25 11:56:41 2013
@@ -42,7 +42,7 @@ public class PoolImplUtils {
 
         @Override
         public PooledObject<T> makeObject() throws Exception {
-            return new PooledObjectImpl<T>(innerFactory.makeObject());
+            return new DefaultPooledObject<T>(innerFactory.makeObject());
         }
 
         @Override
@@ -80,7 +80,7 @@ public class PoolImplUtils {
         @Override
         public PooledObject<V> makeObject(K key) throws Exception {
             V obj = innerFactory.makeObject(key);
-            return new PooledObjectImpl<V>(obj);
+            return new DefaultPooledObject<V>(obj);
         }
 
         @Override