Attachment #376902 for bug #506674

View | Details | Raw Unified | Return to bug 506674
Collapse All | Expand All




   *               <code>null</code>.
   */
  public Object remove(Object key) {
    return removeMapping(key, null); 
  }



   *               <code>null</code>.
   */

  protected Object removeMapping(Object key, Object value) {
    /*
      Find the entry, then 
        1. Set value field to null, to force get() to retry

      if (!(o instanceof Map.Entry))
        return false;
      Map.Entry e = (Map.Entry)o;
      return ConcurrentHashMap.this.removeMapping(e.getKey(), e.getValue()) != null;
    }
    public int size() {
      return ConcurrentHashMap.this.size();

Return to bug 506674

Lines 656-662 Link Here

(-)a/src/java/EDU/oswego/cs/dl/util/concurrent/ConcurrentHashMap.java (-3 / +3 lines)
656	* <code>null</code>.	656	* <code>null</code>.
657	*/	657	*/
658	public Object remove(Object key) {	658	public Object remove(Object key) {
659	return remove(key, null);	659	return removeMapping(key, null);
660	}	660	}
661		661
662		662
Lines 675-681 Link Here
675	* <code>null</code>.	675	* <code>null</code>.
676	*/	676	*/
677		677
678	protected Object remove(Object key, Object value) {	678	protected Object removeMapping(Object key, Object value) {
679	/*	679	/*
680	Find the entry, then	680	Find the entry, then
681	1. Set value field to null, to force get() to retry	681	1. Set value field to null, to force get() to retry
Lines 946-952 Link Here
946	if (!(o instanceof Map.Entry))	946	if (!(o instanceof Map.Entry))
947	return false;	947	return false;
948	Map.Entry e = (Map.Entry)o;	948	Map.Entry e = (Map.Entry)o;
949	return ConcurrentHashMap.this.remove(e.getKey(), e.getValue()) != null;	949	return ConcurrentHashMap.this.removeMapping(e.getKey(), e.getValue()) != null;
950	}	950	}
951	public int size() {	951	public int size() {
952	return ConcurrentHashMap.this.size();	952	return ConcurrentHashMap.this.size();