You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tn...@apache.org on 2014/05/19 22:47:10 UTC

svn commit: r1596053 - in /commons/proper/collections/trunk/src: changes/changes.xml main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java

Author: tn
Date: Mon May 19 20:47:09 2014
New Revision: 1596053

URL: http://svn.apache.org/r1596053
Log:
[COLLECTIONS-523] Remove unneeded private method. Thanks to Thiago Andrade.

Modified:
    commons/proper/collections/trunk/src/changes/changes.xml
    commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java

Modified: commons/proper/collections/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/changes/changes.xml?rev=1596053&r1=1596052&r2=1596053&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/changes/changes.xml (original)
+++ commons/proper/collections/trunk/src/changes/changes.xml Mon May 19 20:47:09 2014
@@ -22,6 +22,9 @@
   <body>
 
   <release version="4.1" date="TBD" description="">
+    <action issue="COLLECTIONS-523" dev="tn" type="fix" due-to="Thiago Andrade">
+      Removed unneeded private method in "PassiveExpiringMap".
+    </action>
     <action issue="COLLECTIONS-516" dev="tn" type="fix" due-to="Cyrille Artho">
       Added clarification to the javadoc of "MapUtils#toProperties(Map)" in case
       of null keys/values.

Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java
URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java?rev=1596053&r1=1596052&r2=1596053&view=diff
==============================================================================
--- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java (original)
+++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections4/map/PassiveExpiringMap.java Mon May 19 20:47:09 2014
@@ -427,14 +427,6 @@ public class PassiveExpiringMap<K, V>
 
     @Override
     public V put(final K key, final V value) {
-        return put(key, value, now());
-    }
-
-    /**
-     * Add the given key-value pair to this map as well as recording the entry's expiration time based on
-     * the current time in milliseconds, <code>now</code> and this map's {@link #expiringPolicy}.
-     */
-    private V put(final K key, final V value, final long now) {
         // record expiration time of new entry
         final long expirationTime = expiringPolicy.expirationTime(key, value);
         expirationMap.put(key, Long.valueOf(expirationTime));