ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/main/java/util/concurrent/ConcurrentMap.java
Revision 1.70 - (view) (download) (annotate) - [select for diffs]
Mon Oct 1 00:10:53 2018 UTC (5 years, 8 months ago) by jsr166
Branch: MAIN
CVS Tags: HEAD
Changes since 1.69: +3 -3 lines
Diff to previous 1.69 , to selected 1.42 
update to using jdk11 by default, except link to jdk10 javadocs;
sync @docRoot references in javadoc with upstream
Revision 1.69 - (view) (download) (annotate) - [select for diffs]
Sat May 6 06:49:46 2017 UTC (7 years ago) by jsr166
Branch: MAIN
Changes since 1.68: +1 -1 lines
Diff to previous 1.68 , to selected 1.42 
8177789: fix collections framework links to point to java.util package doc
Revision 1.68 - (view) (download) (annotate) - [select for diffs]
Wed Apr 19 23:45:51 2017 UTC (7 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.67: +1 -2 lines
Diff to previous 1.67 , to selected 1.42 
Redo @link and @linkplain; one @link was pointing to the wrong poll method
Revision 1.67 - (view) (download) (annotate) - [select for diffs]
Mon Dec 14 21:15:46 2015 UTC (8 years, 5 months ago) by jsr166
Branch: MAIN
Changes since 1.66: +95 -117 lines
Diff to previous 1.66 , to selected 1.42 
improve Map default method implementations, docs and tests
Revision 1.66 - (view) (download) (annotate) - [select for diffs]
Sat Dec 12 20:13:58 2015 UTC (8 years, 5 months ago) by jsr166
Branch: MAIN
Changes since 1.65: +1 -1 lines
Diff to previous 1.65 , to selected 1.42 
whitespace
Revision 1.65 - (view) (download) (annotate) - [select for diffs]
Wed Sep 30 00:03:02 2015 UTC (8 years, 8 months ago) by jsr166
Branch: MAIN
Changes since 1.64: +2 -2 lines
Diff to previous 1.64 , to selected 1.42 
fix all the (optional) broken links using -Xdocrootparent hack
Revision 1.64 - (view) (download) (annotate) - [select for diffs]
Mon Jul 27 03:06:08 2015 UTC (8 years, 10 months ago) by jsr166
Branch: MAIN
Changes since 1.63: +1 -1 lines
Diff to previous 1.63 , to selected 1.42 
whitespace
Revision 1.63 - (view) (download) (annotate) - [select for diffs]
Thu Apr 30 22:13:12 2015 UTC (9 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.62: +3 -4 lines
Diff to previous 1.62 , to selected 1.42 
coding style
Revision 1.62 - (view) (download) (annotate) - [select for diffs]
Thu Apr 30 18:53:51 2015 UTC (9 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.61: +5 -3 lines
Diff to previous 1.61 , to selected 1.42 
fix sample code compilation error
Revision 1.61 - (view) (download) (annotate) - [select for diffs]
Thu Apr 30 18:50:22 2015 UTC (9 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.60: +4 -2 lines
Diff to previous 1.60 , to selected 1.42 
whitespace
Revision 1.60 - (view) (download) (annotate) - [select for diffs]
Thu Apr 30 18:47:12 2015 UTC (9 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.59: +5 -5 lines
Diff to previous 1.59 , to selected 1.42 
add "for this map"
Revision 1.59 - (view) (download) (annotate) - [select for diffs]
Thu Apr 30 18:35:50 2015 UTC (9 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.58: +35 -40 lines
Diff to previous 1.58 , to selected 1.42 
coding style
Revision 1.58 - (view) (download) (annotate) - [select for diffs]
Wed Apr 29 18:31:59 2015 UTC (9 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.57: +0 -1 lines
Diff to previous 1.57 , to selected 1.42 
whitespace
Revision 1.57 - (view) (download) (annotate) - [select for diffs]
Wed Apr 29 18:19:17 2015 UTC (9 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.56: +6 -6 lines
Diff to previous 1.56 , to selected 1.42 
jsr166 coding style
Revision 1.56 - (view) (download) (annotate) - [select for diffs]
Wed Apr 29 18:01:41 2015 UTC (9 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.55: +13 -13 lines
Diff to previous 1.55 , to selected 1.42 
jsr166 coding style
Revision 1.55 - (view) (download) (annotate) - [select for diffs]
Wed Apr 29 11:42:13 2015 UTC (9 years, 1 month ago) by dl
Branch: MAIN
Changes since 1.54: +129 -101 lines
Diff to previous 1.54 , to selected 1.42 
Add guidance about overrides; sync with openjdk
Revision 1.54 - (view) (download) (annotate) - [select for diffs]
Wed Dec 31 08:20:26 2014 UTC (9 years, 5 months ago) by jsr166
Branch: MAIN
Changes since 1.53: +1 -1 lines
Diff to previous 1.53 , to selected 1.42 
indentation
Revision 1.53 - (view) (download) (annotate) - [select for diffs]
Wed Dec 31 07:54:13 2014 UTC (9 years, 5 months ago) by jsr166
Branch: MAIN
Changes since 1.52: +1 -0 lines
Diff to previous 1.52 , to selected 1.42 
standardize import statement order
Revision 1.52 - (view) (download) (annotate) - [select for diffs]
Mon Dec 9 17:00:23 2013 UTC (10 years, 5 months ago) by jsr166
Branch: MAIN
Changes since 1.51: +20 -24 lines
Diff to previous 1.51 , to selected 1.42 
use the one true code snippet style
Revision 1.51 - (view) (download) (annotate) - [select for diffs]
Sat Dec 7 17:59:40 2013 UTC (10 years, 5 months ago) by jsr166
Branch: MAIN
Changes since 1.50: +37 -41 lines
Diff to previous 1.50 , to selected 1.42 
use consistent code snippet formatting
Revision 1.50 - (view) (download) (annotate) - [select for diffs]
Sat Dec 7 17:26:50 2013 UTC (10 years, 5 months ago) by jsr166
Branch: MAIN
Changes since 1.49: +7 -5 lines
Diff to previous 1.49 , to selected 1.42 
fix replaceAll code sample
Revision 1.49 - (view) (download) (annotate) - [select for diffs]
Sat Dec 7 17:10:57 2013 UTC (10 years, 5 months ago) by jsr166
Branch: MAIN
Changes since 1.48: +2 -2 lines
Diff to previous 1.48 , to selected 1.42 
fix syntax error in code samples
Revision 1.48 - (view) (download) (annotate) - [select for diffs]
Sat Dec 7 16:57:09 2013 UTC (10 years, 5 months ago) by jsr166
Branch: MAIN
Changes since 1.47: +4 -4 lines
Diff to previous 1.47 , to selected 1.42 
improve code sample clarity
Revision 1.47 - (view) (download) (annotate) - [select for diffs]
Sat Dec 7 15:58:13 2013 UTC (10 years, 5 months ago) by jsr166
Branch: MAIN
Changes since 1.46: +11 -11 lines
Diff to previous 1.46 , to selected 1.42 
coding style
Revision 1.46 - (view) (download) (annotate) - [select for diffs]
Sat Dec 7 12:20:12 2013 UTC (10 years, 5 months ago) by dl
Branch: MAIN
Changes since 1.45: +315 -27 lines
Diff to previous 1.45 , to selected 1.42 
Spec imnprovements; openJDK sync
Revision 1.45 - (view) (download) (annotate) - [select for diffs]
Tue Jun 18 17:46:16 2013 UTC (10 years, 11 months ago) by jsr166
Branch: MAIN
Changes since 1.44: +1 -1 lines
Diff to previous 1.44 , to selected 1.42 
whitespace
Revision 1.44 - (view) (download) (annotate) - [select for diffs]
Tue Jun 18 09:13:42 2013 UTC (10 years, 11 months ago) by dl
Branch: MAIN
Changes since 1.43: +29 -0 lines
Diff to previous 1.43 , to selected 1.42 
Synch with lambda
Revision 1.43 - (view) (download) (annotate) - [select for diffs]
Sat Jun 8 02:02:15 2013 UTC (10 years, 11 months ago) by jsr166
Branch: MAIN
Changes since 1.42: +1 -1 lines
Diff to previous 1.42 
whitespace
Revision 1.42 - (view) (download) (annotate) - [selected]
Fri Jun 7 23:56:37 2013 UTC (10 years, 11 months ago) by dl
Branch: MAIN
Changes since 1.41: +2 -2 lines
Diff to previous 1.41 
Sync with lambda
Revision 1.41 - (view) (download) (annotate) - [select for diffs]
Mon May 27 13:04:27 2013 UTC (11 years ago) by dl
Branch: MAIN
Changes since 1.40: +15 -0 lines
Diff to previous 1.40 , to selected 1.42 
Mesh with openjdk
Revision 1.40 - (view) (download) (annotate) - [select for diffs]
Mon Mar 18 12:40:30 2013 UTC (11 years, 2 months ago) by dl
Branch: MAIN
Changes since 1.39: +2 -2 lines
Diff to previous 1.39 , to selected 1.42 
Mesh Map and Spliterator methods with lambda
Revision 1.39 - (view) (download) (annotate) - [select for diffs]
Fri Feb 15 22:20:46 2013 UTC (11 years, 3 months ago) by jsr166
Branch: MAIN
Changes since 1.38: +1 -1 lines
Diff to previous 1.38 , to selected 1.42 
whitespace
Revision 1.38 - (view) (download) (annotate) - [select for diffs]
Wed Jan 16 01:59:47 2013 UTC (11 years, 4 months ago) by jsr166
Branch: MAIN
Changes since 1.37: +13 -13 lines
Diff to previous 1.37 , to selected 1.42 
<tt> -> {@code
Revision 1.37 - (view) (download) (annotate) - [select for diffs]
Sun Oct 21 06:14:12 2012 UTC (11 years, 7 months ago) by jsr166
Branch: MAIN
Changes since 1.36: +0 -1 lines
Diff to previous 1.36 , to selected 1.42 
delete trailing empty lines of javadoc
Revision 1.36 - (view) (download) (annotate) - [select for diffs]
Thu Jun 9 07:48:43 2011 UTC (12 years, 11 months ago) by jsr166
Branch: MAIN
Changes since 1.35: +26 -19 lines
Diff to previous 1.35 , to selected 1.42 
consistent style for code snippets
Revision 1.35 - (view) (download) (annotate) - [select for diffs]
Fri Apr 22 01:09:27 2011 UTC (13 years, 1 month ago) by jsr166
Branch: MAIN
CVS Tags: release-1_7_0
Changes since 1.34: +1 -1 lines
Diff to previous 1.34 , to selected 1.42 
whitespace
Revision 1.34 - (view) (download) (annotate) - [select for diffs]
Thu Apr 21 11:29:55 2011 UTC (13 years, 1 month ago) by dl
Branch: MAIN
Changes since 1.33: +1 -1 lines
Diff to previous 1.33 , to selected 1.42 
typos
Revision 1.33 - (view) (download) (annotate) - [select for diffs]
Wed Apr 20 19:08:20 2011 UTC (13 years, 1 month ago) by dl
Branch: MAIN
Changes since 1.32: +2 -2 lines
Diff to previous 1.32 , to selected 1.42 
Use relative URLs in last change
Revision 1.32 - (view) (download) (annotate) - [select for diffs]
Wed Apr 20 16:25:54 2011 UTC (13 years, 1 month ago) by dl
Branch: MAIN
Changes since 1.31: +4 -2 lines
Diff to previous 1.31 , to selected 1.42 
Link for "optional" -- CR 6546713
Revision 1.31 - (view) (download) (annotate) - [select for diffs]
Tue Mar 15 19:47:03 2011 UTC (13 years, 2 months ago) by jsr166
Branch: MAIN
Changes since 1.30: +1 -1 lines
Diff to previous 1.30 , to selected 1.42 
Update Creative Commons license URL in legal notices
Revision 1.30 - (view) (download) (annotate) - [select for diffs]
Sun May 28 23:36:29 2006 UTC (18 years ago) by jsr166
Branch: MAIN
Changes since 1.29: +1 -1 lines
Diff to previous 1.29 , to selected 1.42 
Location of Collections Guide has changed
Revision 1.29 - (view) (download) (annotate) - [select for diffs]
Wed Sep 14 21:45:12 2005 UTC (18 years, 8 months ago) by jsr166
Branch: MAIN
Changes since 1.28: +7 -6 lines
Diff to previous 1.28 , to selected 1.42 
happens-before
Revision 1.28 - (view) (download) (annotate) - [select for diffs]
Thu Sep 8 21:58:22 2005 UTC (18 years, 8 months ago) by jsr166
Branch: MAIN
Changes since 1.27: +2 -2 lines
Diff to previous 1.27 , to selected 1.42 
whitespace
Revision 1.27 - (view) (download) (annotate) - [select for diffs]
Thu Sep 8 00:04:00 2005 UTC (18 years, 8 months ago) by dl
Branch: MAIN
Changes since 1.26: +1 -1 lines
Diff to previous 1.26 , to selected 1.42 
Edit pass for happens-before descriptions
Revision 1.26 - (view) (download) (annotate) - [select for diffs]
Fri Sep 2 01:03:08 2005 UTC (18 years, 9 months ago) by brian
Branch: MAIN
Changes since 1.25: +6 -0 lines
Diff to previous 1.25 , to selected 1.42 
Happens-before markup
Revision 1.25 - (view) (download) (annotate) - [select for diffs]
Wed May 18 00:40:58 2005 UTC (19 years ago) by jsr166
Branch: MAIN
Changes since 1.24: +22 -13 lines
Diff to previous 1.24 , to selected 1.42 
doc fixes
Revision 1.24 - (view) (download) (annotate) - [select for diffs]
Tue May 17 05:27:07 2005 UTC (19 years ago) by jsr166
Branch: MAIN
Changes since 1.23: +36 -36 lines
Diff to previous 1.23 , to selected 1.42 
doc fixes
Revision 1.23 - (view) (download) (annotate) - [select for diffs]
Mon May 2 18:36:04 2005 UTC (19 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.22: +4 -8 lines
Diff to previous 1.22 , to selected 1.42 
improve rendering of whitespace around code examples
Revision 1.22 - (view) (download) (annotate) - [select for diffs]
Wed Apr 27 01:07:23 2005 UTC (19 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.21: +8 -8 lines
Diff to previous 1.21 , to selected 1.42 
doc fixes
Revision 1.21 - (view) (download) (annotate) - [select for diffs]
Tue Apr 26 01:43:01 2005 UTC (19 years, 1 month ago) by jsr166
Branch: MAIN
Changes since 1.20: +40 -42 lines
Diff to previous 1.20 , to selected 1.42 
doc fixes
Revision 1.20 - (view) (download) (annotate) - [select for diffs]
Thu Jun 24 23:55:02 2004 UTC (19 years, 11 months ago) by dl
Branch: MAIN
Changes since 1.19: +6 -0 lines
Diff to previous 1.19 , to selected 1.42 
Documentation wording fixes
Revision 1.19 - (view) (download) (annotate) - [select for diffs]
Tue Jan 27 11:36:31 2004 UTC (20 years, 4 months ago) by dl
Branch: MAIN
CVS Tags: JSR166_PFD
Changes since 1.18: +5 -0 lines
Diff to previous 1.18 , to selected 1.42 
Add Collection framework membership doc
Revision 1.18 - (view) (download) (annotate) - [select for diffs]
Wed Jan 7 20:49:09 2004 UTC (20 years, 4 months ago) by dl
Branch: MAIN
Changes since 1.17: +2 -2 lines
Diff to previous 1.17 , to selected 1.42 
Improve javadoc
Revision 1.17 - (view) (download) (annotate) - [select for diffs]
Sat Dec 27 19:26:25 2003 UTC (20 years, 5 months ago) by dl
Branch: MAIN
Changes since 1.16: +2 -2 lines
Diff to previous 1.16 , to selected 1.42 
Headers reference Creative Commons
Revision 1.16 - (view) (download) (annotate) - [select for diffs]
Sat Dec 6 00:16:20 2003 UTC (20 years, 6 months ago) by dl
Branch: MAIN
CVS Tags: JSR166_DEC9_POST_ES_SUBMIT, JSR166_DEC9_PRE_ES_SUBMIT
Changes since 1.15: +8 -5 lines
Diff to previous 1.15 , to selected 1.42 
replace returns old value
Revision 1.15 - (view) (download) (annotate) - [select for diffs]
Wed Dec 3 21:07:44 2003 UTC (20 years, 6 months ago) by dl
Branch: MAIN
Changes since 1.14: +19 -0 lines
Diff to previous 1.14 , to selected 1.42 
Add ConcurrentMap.replace; fix other typos
Revision 1.14 - (view) (download) (annotate) - [select for diffs]
Fri Nov 28 12:37:00 2003 UTC (20 years, 6 months ago) by dl
Branch: MAIN
Changes since 1.13: +23 -2 lines
Diff to previous 1.13 , to selected 1.42 
Added replace method
Revision 1.13 - (view) (download) (annotate) - [select for diffs]
Sun Oct 19 13:38:34 2003 UTC (20 years, 7 months ago) by dl
Branch: MAIN
CVS Tags: JSR166_NOV3_FREEZE
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 , to selected 1.42 
Changed doc strings for generic params
Revision 1.12 - (view) (download) (annotate) - [select for diffs]
Sat Oct 18 12:29:33 2003 UTC (20 years, 7 months ago) by dl
Branch: MAIN
Changes since 1.11: +2 -0 lines
Diff to previous 1.11 , to selected 1.42 
Added docs for type params
Revision 1.11 - (view) (download) (annotate) - [select for diffs]
Sun Aug 31 13:33:13 2003 UTC (20 years, 9 months ago) by dl
Branch: MAIN
Changes since 1.10: +1 -1 lines
Diff to previous 1.10 , to selected 1.42 
Removed non-standard tags and misc javadoc cleanup
Revision 1.10 - (view) (download) (annotate) - [select for diffs]
Fri Aug 8 20:05:07 2003 UTC (20 years, 9 months ago) by tim
Branch: MAIN
Changes since 1.9: +1 -2 lines
Diff to previous 1.9 , to selected 1.42 
Scrunched catch, finally, else clauses.
Revision 1.9 - (view) (download) (annotate) - [select for diffs]
Wed Aug 6 01:57:53 2003 UTC (20 years, 10 months ago) by dholmes
Branch: MAIN
CVS Tags: JSR166_CR1
Changes since 1.8: +2 -2 lines
Diff to previous 1.8 , to selected 1.42 
Final major updates to Collection related classes.
Revision 1.8 - (view) (download) (annotate) - [select for diffs]
Mon Aug 4 12:10:27 2003 UTC (20 years, 10 months ago) by dl
Branch: MAIN
Changes since 1.7: +3 -0 lines
Diff to previous 1.7 , to selected 1.42 
Remove signatures now match
Clarified nanoTime wraparound/overflow
Revision 1.7 - (view) (download) (annotate) - [select for diffs]
Fri Aug 1 22:48:54 2003 UTC (20 years, 10 months ago) by dl
Branch: MAIN
Changes since 1.6: +9 -2 lines
Diff to previous 1.6 , to selected 1.42 
Fixed signatures on ConcurrentMap.remove
Revision 1.6 - (view) (download) (annotate) - [select for diffs]
Fri Aug 1 22:40:05 2003 UTC (20 years, 10 months ago) by dl
Branch: MAIN
Changes since 1.5: +12 -1 lines
Diff to previous 1.5 , to selected 1.42 
Added remove to ConcurrentMap. Fixed constuctor call in Executors.
Revision 1.5 - (view) (download) (annotate) - [select for diffs]
Sat Jul 19 15:36:22 2003 UTC (20 years, 10 months ago) by dl
Branch: MAIN
Changes since 1.4: +4 -2 lines
Diff to previous 1.4 , to selected 1.42 
Fixed code example error
Revision 1.4 - (view) (download) (annotate) - [select for diffs]
Tue Jun 24 14:34:47 2003 UTC (20 years, 11 months ago) by dl
Branch: MAIN
CVS Tags: JSR166_PRELIMINARY_TEST_RELEASE_2
Changes since 1.3: +4 -2 lines
Diff to previous 1.3 , to selected 1.42 
Added missing javadoc tags; minor reformatting
Revision 1.3 - (view) (download) (annotate) - [select for diffs]
Sat Jun 7 18:20:20 2003 UTC (21 years ago) by dl
Branch: MAIN
CVS Tags: JSR166_PRELIMINARY_TEST_RELEASE_1
Changes since 1.2: +1 -1 lines
Diff to previous 1.2 , to selected 1.42 
Misc documentation updates
Revision 1.2 - (view) (download) (annotate) - [select for diffs]
Tue May 27 18:14:39 2003 UTC (21 years ago) by dl
Branch: MAIN
CVS Tags: JSR166_PRERELEASE_0_1
Changes since 1.1: +6 -1 lines
Diff to previous 1.1 , to selected 1.42 
re-check-in initial implementations
Revision 1.1 - (view) (download) (annotate) - [select for diffs]
Wed May 14 21:30:45 2003 UTC (21 years ago) by tim
Branch: MAIN
Diff to selected 1.42 
Moved main source rooted at . to ./src/main
Moved test source rooted at ./etc/testcases to ./src/test

Convenience Links

Links to HEAD: (view) (download) (annotate)

Compare Revisions

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.

  Diffs between and
  Type of Diff should be a