svn commit: r1096377 - /commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java

[simonetripodi]

Author: simonetripodi
Date: Sun Apr 24 20:20:42 2011
New Revision: 1096377

URL: http://svn.apache.org/viewvc?rev=1096377&view=rev
Log:
direct deprecated access to inner class fields replaced by getters invocation

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

Modified: 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1096377&r1=1096376&r2=1096377&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
 (original)
+++ 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
 Sun Apr 24 20:20:42 2011
@@ -1226,20 +1226,20 @@ public class GenericKeyedObjectPool<K,V>
 
             // activate & validate the object
             try {
-                _factory.activateObject(key, latch.getPair().value);
-                if (_testOnBorrow && !_factory.validateObject(key, 
latch.getPair().value)) {
+                _factory.activateObject(key, latch.getPair().getValue());
+                if (_testOnBorrow && !_factory.validateObject(key, 
latch.getPair().getValue())) {
                     throw new Exception("ValidateObject failed");
                 }
                 synchronized (this) {
                     latch.getPool().decrementInternalProcessingCount();
                     latch.getPool().incrementActiveCount();
                 }
-                return latch.getPair().value;
+                return latch.getPair().getValue();
             } catch (Throwable e) {
                 PoolUtils.checkRethrow(e);
                 // object cannot be activated or is invalid
                 try {
-                    _factory.destroyObject(key, latch.getPair().value);
+                    _factory.destroyObject(key, latch.getPair().getValue());
                 } catch (Throwable e2) {
                     PoolUtils.checkRethrow(e2);
                     // cannot destroy broken object
@@ -1487,7 +1487,7 @@ public class GenericKeyedObjectPool<K,V>
             Collection<ObjectTimestampPair<V>> c = entry.getValue();
             for (Iterator<ObjectTimestampPair<V>> it = c.iterator(); 
it.hasNext();) {
                 try {
-                    factory.destroyObject(key, it.next().value);
+                    factory.destroyObject(key, it.next().getValue());
                 } catch (Exception e) {
                     // ignore error, keep destroying the rest
                 } finally {
@@ -1958,24 +1958,24 @@ public class GenericKeyedObjectPool<K,V>
 
             boolean removeObject=false;
             if ((minEvictableIdleTimeMillis > 0) &&
-               (System.currentTimeMillis() - pair.tstamp >
+               (System.currentTimeMillis() - pair.getTstamp() >
                minEvictableIdleTimeMillis)) {
                 removeObject=true;
             }
             if (testWhileIdle && removeObject == false) {
                 boolean active = false;
                 try {
-                    _factory.activateObject(key,pair.value);
+                    _factory.activateObject(key,pair.getValue());
                     active = true;
                 } catch(Exception e) {
                     removeObject=true;
                 }
                 if (active) {
-                    if (!_factory.validateObject(key,pair.value)) {
+                    if (!_factory.validateObject(key,pair.getValue())) {
                         removeObject=true;
                     } else {
                         try {
-                            _factory.passivateObject(key,pair.value);
+                            _factory.passivateObject(key,pair.getValue());
                         } catch(Exception e) {
                             removeObject=true;
                         }
@@ -1985,7 +1985,7 @@ public class GenericKeyedObjectPool<K,V>
 
             if (removeObject) {
                 try {
-                    _factory.destroyObject(key, pair.value);
+                    _factory.destroyObject(key, pair.getValue());
                 } catch(Exception e) {
                     // ignored
                 }